Commits · 145581ebf4ef9d58607dbe02e247c77d382364fc · Ascend / inventory-service

18 May, 2021 9 commits
- Deployment 53 · 145581eb
  Ben Anderson authored May 18, 2021
  
  145581eb
- Deployment 53 · f805b0bd
  Ben Anderson authored May 18, 2021
  
  f805b0bd
- Deployment 53 · 8ee51cc1
  Ben Anderson authored May 18, 2021
  
  8ee51cc1
- Deployment 51 · 4b6fe9fc
  Ben Anderson authored May 18, 2021
  
  4b6fe9fc
- Deployment 51 · 327c226d
  Ben Anderson authored May 18, 2021
  
  327c226d
- Deployment 50 · 0450a967
  Ben Anderson authored May 18, 2021
  
  0450a967
- Updated deployment file · 956cba56
  Ben Anderson authored May 18, 2021
  
  956cba56
- Updated deployment file · ab6121f8
  Ben Anderson authored May 18, 2021
  
  ab6121f8
- Updated deployment file with new Kafka server connection env variable · c61de549
  Ben Anderson authored May 18, 2021
  
  c61de549
17 May, 2021 7 commits
- Updated deployment file · 3cec9802
  Ben Anderson authored May 17, 2021
  
  3cec9802
- Updated deployment file · 4fd701c2
  Ben Anderson authored May 17, 2021
  
  4fd701c2
- Updated deployment file · 3cf766db
  Ben Anderson authored May 17, 2021
  
  3cf766db
- Updated properties · f1483ac8
  Ben Anderson authored May 17, 2021
  
  f1483ac8
- Resolved merge conflict and updated deployment file · 97fb7a23
  Ben Anderson authored May 17, 2021
  
  97fb7a23
- Merge branch 'deploy' of https://gitlab.mynisum.com/ascend/inventory-backend into deploy · ddab3806
  Ben Anderson authored May 17, 2021
  
  ddab3806
- Changed application.properties · 186abba3
  Ben Anderson authored May 17, 2021
  
  186abba3
13 May, 2021 16 commits
- Update deployment.yaml · 9f0531e1
  Veera Venkata Siva S Villa authored May 14, 2021
  
  9f0531e1
- Merge branch 'AFP-66-kafka-consumers' into 'dev' · 15e00df8
  Sumaiyya Burney authored May 14, 2021
```
Fixes product stock adjustment

See merge request !13
```
  15e00df8
- Merge branch 'dev' into 'AFP-66-kafka-consumers' · f1aef163
  Sumaiyya Burney authored May 14, 2021
```
# Conflicts:
#   src/main/java/com/nisum/ascend/inventory/service/ProductService.java
```
  f1aef163
- Fixes product stock adjustment · d76aa43d
  Sumaiyya Burney authored May 14, 2021
  
  d76aa43d
- integration demo · 9cfc6895
  Christopher Cottier authored May 14, 2021
  
  9cfc6895
- Fix spelling error on ProductService · ce149729
  Khai Yuan Liew authored May 13, 2021
  
  ce149729
- Merge branch 'AFP-66-kafka-consumers' into 'dev' · 96b18f03
  Khai Yuan Liew authored May 13, 2021
```
Afp 66 kafka consumers

See merge request !12
```
  96b18f03
- [AFP-66] Correct spelling error · b96ca2f5
  Khai Yuan Liew authored May 13, 2021
  
  b96ca2f5
- merge branch with dev before pushing · 583b954c
  John Lam authored May 13, 2021
  
  583b954c
- split kafka consumer methods into order and warehouse · bc3b1318
  John Lam authored May 13, 2021
  
  bc3b1318
- Updated deployment file and properties · dd092589
  Ben Anderson authored May 13, 2021
  
  dd092589
- Updated deployment file · 63177c99
  Ben Anderson authored May 13, 2021
  
  63177c99
- Renamed deployment file · 965994b6
  Ben Anderson authored May 13, 2021
  
  965994b6
- fix cancelled items notaffecting fulfilledstock · 385a1be5
  John Lam authored May 13, 2021
  
  385a1be5
- add correct topic namesfor ordermanagement and warehouse · ec18315a
  John Lam authored May 13, 2021
  
  ec18315a
- working kafka consumers for warehouse and ordermanagement · 6859bdf4
  John Lam authored May 13, 2021
  
  6859bdf4
12 May, 2021 8 commits
- update kafkalistener · 5034fe71
  John Lam authored May 13, 2021
  
  5034fe71
- add kafka warehouse order status · 59e261bd
  John Lam authored May 13, 2021
  
  59e261bd
- Merge branch 'fixing-tests' into 'dev' · b3ee5e26
  Sumaiyya Burney authored May 12, 2021
```
Fixes delete and update tests

See merge request !11
```
  b3ee5e26
- Fixes delete and update tests · 1a6f0322
  Sumaiyya Burney authored May 12, 2021
  
  1a6f0322
- Removed additional unused dto imports · 2fd1bc10
  Khai Yuan Liew authored May 12, 2021
  
  2fd1bc10
- Merge remote-tracking branch 'origin/dev' into AFP-66-kafka-consumers · 39693637
  John Lam authored May 12, 2021
  
  39693637
- Removed unusued dto import · f6ac5a41
  Khai Yuan Liew authored May 12, 2021
  
  f6ac5a41
- merge branch with dev before pushing · 6679afe8
  John Lam authored May 12, 2021
  
  6679afe8