@medusajs/medusa 1.3.9 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (173) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/CHANGELOG.md +12 -0
  3. package/dist/api/index.d.ts +1 -0
  4. package/dist/api/index.js +1 -0
  5. package/dist/api/index.js.map +1 -1
  6. package/dist/api/routes/admin/batch/create-batch-job.js +10 -7
  7. package/dist/api/routes/admin/batch/create-batch-job.js.map +1 -1
  8. package/dist/api/routes/admin/index.js +6 -4
  9. package/dist/api/routes/admin/index.js.map +1 -1
  10. package/dist/api/routes/admin/price-lists/create-price-list.d.ts +4 -0
  11. package/dist/api/routes/admin/price-lists/create-price-list.js +16 -1
  12. package/dist/api/routes/admin/price-lists/create-price-list.js.map +1 -1
  13. package/dist/api/routes/admin/price-lists/index.d.ts +2 -1
  14. package/dist/api/routes/admin/price-lists/index.js +8 -1
  15. package/dist/api/routes/admin/price-lists/index.js.map +1 -1
  16. package/dist/api/routes/admin/price-lists/update-price-list.d.ts +4 -0
  17. package/dist/api/routes/admin/price-lists/update-price-list.js +16 -1
  18. package/dist/api/routes/admin/price-lists/update-price-list.js.map +1 -1
  19. package/dist/api/routes/admin/products/update-variant.js +1 -0
  20. package/dist/api/routes/admin/products/update-variant.js.map +1 -1
  21. package/dist/api/routes/admin/regions/create-region.d.ts +4 -0
  22. package/dist/api/routes/admin/regions/create-region.js +16 -1
  23. package/dist/api/routes/admin/regions/create-region.js.map +1 -1
  24. package/dist/api/routes/admin/regions/index.d.ts +2 -1
  25. package/dist/api/routes/admin/regions/index.js +5 -1
  26. package/dist/api/routes/admin/regions/index.js.map +1 -1
  27. package/dist/api/routes/admin/regions/update-region.d.ts +4 -0
  28. package/dist/api/routes/admin/regions/update-region.js +16 -1
  29. package/dist/api/routes/admin/regions/update-region.js.map +1 -1
  30. package/dist/api/routes/admin/shipping-options/create-shipping-option.d.ts +4 -0
  31. package/dist/api/routes/admin/shipping-options/create-shipping-option.js +15 -0
  32. package/dist/api/routes/admin/shipping-options/create-shipping-option.js.map +1 -1
  33. package/dist/api/routes/admin/shipping-options/index.d.ts +2 -1
  34. package/dist/api/routes/admin/shipping-options/index.js +5 -1
  35. package/dist/api/routes/admin/shipping-options/index.js.map +1 -1
  36. package/dist/api/routes/admin/shipping-options/update-shipping-option.d.ts +4 -0
  37. package/dist/api/routes/admin/shipping-options/update-shipping-option.js +15 -0
  38. package/dist/api/routes/admin/shipping-options/update-shipping-option.js.map +1 -1
  39. package/dist/helpers/test-request.js +27 -4
  40. package/dist/helpers/test-request.js.map +1 -1
  41. package/dist/interfaces/price-selection-strategy.d.ts +4 -0
  42. package/dist/interfaces/price-selection-strategy.js.map +1 -1
  43. package/dist/loaders/feature-flags/index.d.ts +1 -0
  44. package/dist/loaders/feature-flags/index.js +18 -3
  45. package/dist/loaders/feature-flags/index.js.map +1 -1
  46. package/dist/loaders/feature-flags/order-editing.d.ts +3 -0
  47. package/dist/loaders/feature-flags/order-editing.js +10 -0
  48. package/dist/loaders/feature-flags/order-editing.js.map +1 -0
  49. package/dist/migrations/1663059812399-order_editing.d.ts +7 -0
  50. package/dist/migrations/1663059812399-order_editing.js +112 -0
  51. package/dist/migrations/1663059812399-order_editing.js.map +1 -0
  52. package/dist/models/currency.d.ts +4 -0
  53. package/dist/models/currency.js +12 -0
  54. package/dist/models/currency.js.map +1 -1
  55. package/dist/models/custom-shipping-option.d.ts +3 -0
  56. package/dist/models/custom-shipping-option.js +3 -0
  57. package/dist/models/custom-shipping-option.js.map +1 -1
  58. package/dist/models/line-item.d.ts +4 -0
  59. package/dist/models/line-item.js +12 -0
  60. package/dist/models/line-item.js.map +1 -1
  61. package/dist/models/money-amount.d.ts +2 -2
  62. package/dist/models/money-amount.js.map +1 -1
  63. package/dist/models/order-edit.d.ts +111 -0
  64. package/dist/models/order-edit.js +204 -0
  65. package/dist/models/order-edit.js.map +1 -0
  66. package/dist/models/order-item-change.d.ts +60 -0
  67. package/dist/models/order-item-change.js +143 -0
  68. package/dist/models/order-item-change.js.map +1 -0
  69. package/dist/models/order.d.ts +7 -0
  70. package/dist/models/order.js +16 -0
  71. package/dist/models/order.js.map +1 -1
  72. package/dist/models/price-list.d.ts +5 -0
  73. package/dist/models/price-list.js +13 -0
  74. package/dist/models/price-list.js.map +1 -1
  75. package/dist/models/region.d.ts +4 -0
  76. package/dist/models/region.js +12 -0
  77. package/dist/models/region.js.map +1 -1
  78. package/dist/models/shipping-method.d.ts +4 -0
  79. package/dist/models/shipping-method.js +12 -0
  80. package/dist/models/shipping-method.js.map +1 -1
  81. package/dist/models/shipping-option.d.ts +4 -0
  82. package/dist/models/shipping-option.js +12 -0
  83. package/dist/models/shipping-option.js.map +1 -1
  84. package/dist/repositories/currency.d.ts +1 -1
  85. package/dist/repositories/currency.js +2 -2
  86. package/dist/repositories/currency.js.map +1 -1
  87. package/dist/repositories/money-amount.d.ts +1 -1
  88. package/dist/repositories/money-amount.js +8 -4
  89. package/dist/repositories/money-amount.js.map +1 -1
  90. package/dist/repositories/order-edit.d.ts +4 -0
  91. package/dist/repositories/order-edit.js +38 -0
  92. package/dist/repositories/order-edit.js.map +1 -0
  93. package/dist/repositories/order-item-change.d.ts +4 -0
  94. package/dist/repositories/order-item-change.js +38 -0
  95. package/dist/repositories/order-item-change.js.map +1 -0
  96. package/dist/services/batch-job.js +4 -2
  97. package/dist/services/batch-job.js.map +1 -1
  98. package/dist/services/cart.js +83 -74
  99. package/dist/services/cart.js.map +1 -1
  100. package/dist/services/claim.js +45 -43
  101. package/dist/services/claim.js.map +1 -1
  102. package/dist/services/discount.d.ts +4 -1
  103. package/dist/services/discount.js +39 -20
  104. package/dist/services/discount.js.map +1 -1
  105. package/dist/services/index.d.ts +1 -1
  106. package/dist/services/index.js +3 -3
  107. package/dist/services/index.js.map +1 -1
  108. package/dist/services/line-item-adjustment.d.ts +1 -4
  109. package/dist/services/line-item-adjustment.js +2 -1
  110. package/dist/services/line-item-adjustment.js.map +1 -1
  111. package/dist/services/line-item.d.ts +12 -7
  112. package/dist/services/line-item.js +22 -10
  113. package/dist/services/line-item.js.map +1 -1
  114. package/dist/services/notification.js +3 -2
  115. package/dist/services/notification.js.map +1 -1
  116. package/dist/services/order.js +214 -115
  117. package/dist/services/order.js.map +1 -1
  118. package/dist/services/price-list.d.ts +7 -4
  119. package/dist/services/price-list.js +25 -11
  120. package/dist/services/price-list.js.map +1 -1
  121. package/dist/services/pricing.d.ts +7 -4
  122. package/dist/services/pricing.js +39 -12
  123. package/dist/services/pricing.js.map +1 -1
  124. package/dist/services/product-variant.js +1 -1
  125. package/dist/services/product-variant.js.map +1 -1
  126. package/dist/services/region.d.ts +10 -7
  127. package/dist/services/region.js +22 -6
  128. package/dist/services/region.js.map +1 -1
  129. package/dist/services/return.js +23 -19
  130. package/dist/services/return.js.map +1 -1
  131. package/dist/services/shipping-option.d.ts +12 -8
  132. package/dist/services/shipping-option.js +23 -2
  133. package/dist/services/shipping-option.js.map +1 -1
  134. package/dist/services/store.d.ts +1 -2
  135. package/dist/services/store.js.map +1 -1
  136. package/dist/services/totals.d.ts +18 -20
  137. package/dist/services/totals.js +614 -358
  138. package/dist/services/totals.js.map +1 -1
  139. package/dist/strategies/__fixtures__/product-export-data.js +6 -2
  140. package/dist/strategies/__fixtures__/product-export-data.js.map +1 -1
  141. package/dist/strategies/batch-jobs/product/export.d.ts +6 -0
  142. package/dist/strategies/batch-jobs/product/export.js +11 -2
  143. package/dist/strategies/batch-jobs/product/export.js.map +1 -1
  144. package/dist/strategies/batch-jobs/product/import.d.ts +6 -5
  145. package/dist/strategies/batch-jobs/product/import.js +293 -197
  146. package/dist/strategies/batch-jobs/product/import.js.map +1 -1
  147. package/dist/strategies/batch-jobs/product/index.js +2 -2
  148. package/dist/strategies/batch-jobs/product/types.d.ts +8 -0
  149. package/dist/strategies/batch-jobs/product/types.js.map +1 -1
  150. package/dist/strategies/batch-jobs/product/utils.d.ts +1 -1
  151. package/dist/strategies/batch-jobs/product/utils.js +10 -1
  152. package/dist/strategies/batch-jobs/product/utils.js.map +1 -1
  153. package/dist/strategies/price-selection.d.ts +6 -2
  154. package/dist/strategies/price-selection.js +124 -10
  155. package/dist/strategies/price-selection.js.map +1 -1
  156. package/dist/strategies/tax-calculation.d.ts +7 -5
  157. package/dist/strategies/tax-calculation.js +47 -17
  158. package/dist/strategies/tax-calculation.js.map +1 -1
  159. package/dist/subscribers/batch-job.d.ts +4 -1
  160. package/dist/subscribers/batch-job.js +71 -44
  161. package/dist/subscribers/batch-job.js.map +1 -1
  162. package/dist/types/price-list.d.ts +2 -1
  163. package/dist/types/pricing.d.ts +5 -2
  164. package/dist/types/region.d.ts +2 -0
  165. package/dist/types/shipping-options.d.ts +2 -0
  166. package/dist/utils/feature-flag-decorators.js +4 -16
  167. package/dist/utils/feature-flag-decorators.js.map +1 -1
  168. package/dist/utils/flag-router.d.ts +1 -1
  169. package/dist/utils/flag-router.js.map +1 -1
  170. package/dist/utils/index.d.ts +2 -0
  171. package/dist/utils/index.js +2 -0
  172. package/dist/utils/index.js.map +1 -1
  173. package/package.json +1 -3
@@ -42,70 +42,97 @@ Object.defineProperty(exports, "__esModule", { value: true });
42
42
  var batch_job_1 = __importDefault(require("../services/batch-job"));
43
43
  var BatchJobSubscriber = /** @class */ (function () {
44
44
  function BatchJobSubscriber(_a) {
45
- var eventBusService = _a.eventBusService, batchJobService = _a.batchJobService, strategyResolverService = _a.strategyResolverService;
45
+ var eventBusService = _a.eventBusService, batchJobService = _a.batchJobService, strategyResolverService = _a.strategyResolverService, manager = _a.manager;
46
46
  var _this = this;
47
47
  this.preProcessBatchJob = function (data) { return __awaiter(_this, void 0, void 0, function () {
48
- var batchJob, batchJobStrategy, e_1;
48
+ var _this = this;
49
49
  return __generator(this, function (_a) {
50
50
  switch (_a.label) {
51
- case 0: return [4 /*yield*/, this.batchJobService_.retrieve(data.id)];
51
+ case 0: return [4 /*yield*/, this.manager_.transaction(function (manager) { return __awaiter(_this, void 0, void 0, function () {
52
+ var batchJobServiceTx, batchJob, batchJobStrategy, e_1;
53
+ return __generator(this, function (_a) {
54
+ switch (_a.label) {
55
+ case 0:
56
+ batchJobServiceTx = this.batchJobService_.withTransaction(manager);
57
+ return [4 /*yield*/, batchJobServiceTx.retrieve(data.id)];
58
+ case 1:
59
+ batchJob = _a.sent();
60
+ batchJobStrategy = this.strategyResolver_.resolveBatchJobByType(batchJob.type);
61
+ _a.label = 2;
62
+ case 2:
63
+ _a.trys.push([2, 5, , 7]);
64
+ return [4 /*yield*/, batchJobStrategy
65
+ .withTransaction(manager)
66
+ .preProcessBatchJob(batchJob.id)];
67
+ case 3:
68
+ _a.sent();
69
+ return [4 /*yield*/, batchJobServiceTx.setPreProcessingDone(batchJob.id)];
70
+ case 4:
71
+ _a.sent();
72
+ return [3 /*break*/, 7];
73
+ case 5:
74
+ e_1 = _a.sent();
75
+ return [4 /*yield*/, this.batchJobService_.setFailed(batchJob.id)];
76
+ case 6:
77
+ _a.sent();
78
+ throw e_1;
79
+ case 7: return [2 /*return*/];
80
+ }
81
+ });
82
+ }); })];
52
83
  case 1:
53
- batchJob = _a.sent();
54
- batchJobStrategy = this.strategyResolver_.resolveBatchJobByType(batchJob.type);
55
- _a.label = 2;
56
- case 2:
57
- _a.trys.push([2, 5, , 7]);
58
- return [4 /*yield*/, batchJobStrategy.preProcessBatchJob(batchJob.id)];
59
- case 3:
60
84
  _a.sent();
61
- return [4 /*yield*/, this.batchJobService_.setPreProcessingDone(batchJob.id)];
62
- case 4:
63
- _a.sent();
64
- return [3 /*break*/, 7];
65
- case 5:
66
- e_1 = _a.sent();
67
- return [4 /*yield*/, this.batchJobService_.setFailed(batchJob.id)];
68
- case 6:
69
- _a.sent();
70
- throw e_1;
71
- case 7: return [2 /*return*/];
85
+ return [2 /*return*/];
72
86
  }
73
87
  });
74
88
  }); };
75
89
  this.processBatchJob = function (data) { return __awaiter(_this, void 0, void 0, function () {
76
- var batchJob, batchJobStrategy, e_2;
90
+ var _this = this;
77
91
  return __generator(this, function (_a) {
78
92
  switch (_a.label) {
79
- case 0: return [4 /*yield*/, this.batchJobService_.retrieve(data.id)];
93
+ case 0: return [4 /*yield*/, this.manager_.transaction(function (manager) { return __awaiter(_this, void 0, void 0, function () {
94
+ var batchJobServiceTx, batchJob, batchJobStrategy, e_2;
95
+ return __generator(this, function (_a) {
96
+ switch (_a.label) {
97
+ case 0:
98
+ batchJobServiceTx = this.batchJobService_.withTransaction(manager);
99
+ return [4 /*yield*/, batchJobServiceTx.retrieve(data.id)];
100
+ case 1:
101
+ batchJob = _a.sent();
102
+ batchJobStrategy = this.strategyResolver_.resolveBatchJobByType(batchJob.type);
103
+ return [4 /*yield*/, batchJobServiceTx.setProcessing(batchJob.id)];
104
+ case 2:
105
+ _a.sent();
106
+ _a.label = 3;
107
+ case 3:
108
+ _a.trys.push([3, 6, , 8]);
109
+ return [4 /*yield*/, batchJobStrategy.withTransaction(manager).processJob(batchJob.id)];
110
+ case 4:
111
+ _a.sent();
112
+ return [4 /*yield*/, batchJobServiceTx.complete(batchJob.id)];
113
+ case 5:
114
+ _a.sent();
115
+ return [3 /*break*/, 8];
116
+ case 6:
117
+ e_2 = _a.sent();
118
+ return [4 /*yield*/, this.batchJobService_.setFailed(batchJob.id)];
119
+ case 7:
120
+ _a.sent();
121
+ throw e_2;
122
+ case 8: return [2 /*return*/];
123
+ }
124
+ });
125
+ }); })];
80
126
  case 1:
81
- batchJob = _a.sent();
82
- batchJobStrategy = this.strategyResolver_.resolveBatchJobByType(batchJob.type);
83
- return [4 /*yield*/, this.batchJobService_.setProcessing(batchJob.id)];
84
- case 2:
85
- _a.sent();
86
- _a.label = 3;
87
- case 3:
88
- _a.trys.push([3, 6, , 8]);
89
- return [4 /*yield*/, batchJobStrategy.processJob(batchJob.id)];
90
- case 4:
91
- _a.sent();
92
- return [4 /*yield*/, this.batchJobService_.complete(batchJob.id)];
93
- case 5:
94
- _a.sent();
95
- return [3 /*break*/, 8];
96
- case 6:
97
- e_2 = _a.sent();
98
- return [4 /*yield*/, this.batchJobService_.setFailed(batchJob.id)];
99
- case 7:
100
127
  _a.sent();
101
- throw e_2;
102
- case 8: return [2 /*return*/];
128
+ return [2 /*return*/];
103
129
  }
104
130
  });
105
131
  }); };
106
132
  this.eventBusService_ = eventBusService;
107
133
  this.batchJobService_ = batchJobService;
108
134
  this.strategyResolver_ = strategyResolverService;
135
+ this.manager_ = manager;
109
136
  this.eventBusService_
110
137
  .subscribe(batch_job_1.default.Events.CREATED, this.preProcessBatchJob)
111
138
  .subscribe(batch_job_1.default.Events.CONFIRMED, this.processBatchJob);
@@ -1 +1 @@
1
- {"version":3,"file":"batch-job.js","sourceRoot":"","sources":["../../src/subscribers/batch-job.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAmD;AAUnD;IAKE,4BAAY,EAIW;YAHrB,eAAe,qBAAA,EACf,eAAe,qBAAA,EACf,uBAAuB,6BAAA;QAHzB,iBAYC;QAED,uBAAkB,GAAG,UAAO,IAAI;;;;4BACb,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAA;;wBAAxD,QAAQ,GAAG,SAA6C;wBAExD,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CACnE,QAAQ,CAAC,IAAI,CACd,CAAA;;;;wBAGC,qBAAM,gBAAgB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAAtD,SAAsD,CAAA;wBACtD,qBAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAA7D,SAA6D,CAAA;;;;wBAE7D,qBAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAAlD,SAAkD,CAAA;wBAClD,MAAM,GAAC,CAAA;;;;aAEV,CAAA;QAED,oBAAe,GAAG,UAAO,IAAI;;;;4BACV,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAA;;wBAAxD,QAAQ,GAAG,SAA6C;wBAExD,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CACnE,QAAQ,CAAC,IAAI,CACd,CAAA;wBAED,qBAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAAtD,SAAsD,CAAA;;;;wBAGpD,qBAAM,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAA9C,SAA8C,CAAA;wBAC9C,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAAjD,SAAiD,CAAA;;;;wBAEjD,qBAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wBAAlD,SAAkD,CAAA;wBAClD,MAAM,GAAC,CAAA;;;;aAEV,CAAA;QAzCC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAA;QACvC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAA;QACvC,IAAI,CAAC,iBAAiB,GAAG,uBAAuB,CAAA;QAEhD,IAAI,CAAC,gBAAgB;aAClB,SAAS,CAAC,mBAAe,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC;aAClE,SAAS,CAAC,mBAAe,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;IACtE,CAAC;IAmCH,yBAAC;AAAD,CAAC,AApDD,IAoDC;AAED,kBAAe,kBAAkB,CAAA"}
1
+ {"version":3,"file":"batch-job.js","sourceRoot":"","sources":["../../src/subscribers/batch-job.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAmD;AAYnD;IAME,4BAAY,EAKW;YAJrB,eAAe,qBAAA,EACf,eAAe,qBAAA,EACf,uBAAuB,6BAAA,EACvB,OAAO,aAAA;QAJT,iBAcC;QAED,uBAAkB,GAAG,UAAO,IAAI;;;;4BAC9B,qBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAO,OAAO;;;;;wCACtC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;wCACvD,qBAAM,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAA;;wCAApD,QAAQ,GAAG,SAAyC;wCAEpD,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CACnE,QAAQ,CAAC,IAAI,CACd,CAAA;;;;wCAGC,qBAAM,gBAAgB;iDACnB,eAAe,CAAC,OAAO,CAAC;iDACxB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAFlC,SAEkC,CAAA;wCAClC,qBAAM,iBAAiB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAAzD,SAAyD,CAAA;;;;wCAEzD,qBAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAAlD,SAAkD,CAAA;wCAClD,MAAM,GAAC,CAAA;;;;6BAEV,CAAC,EAAA;;wBAjBF,SAiBE,CAAA;;;;aACH,CAAA;QAED,oBAAe,GAAG,UAAO,IAAI;;;;4BAC3B,qBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAO,OAAO;;;;;wCACtC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;wCACvD,qBAAM,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAA;;wCAApD,QAAQ,GAAG,SAAyC;wCAEpD,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CACnE,QAAQ,CAAC,IAAI,CACd,CAAA;wCAED,qBAAM,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAAlD,SAAkD,CAAA;;;;wCAGhD,qBAAM,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAAvE,SAAuE,CAAA;wCACvE,qBAAM,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAA7C,SAA6C,CAAA;;;;wCAE7C,qBAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAAlD,SAAkD,CAAA;wCAClD,MAAM,GAAC,CAAA;;;;6BAEV,CAAC,EAAA;;wBAjBF,SAiBE,CAAA;;;;aACH,CAAA;QAlDC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAA;QACvC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAA;QACvC,IAAI,CAAC,iBAAiB,GAAG,uBAAuB,CAAA;QAChD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QAEvB,IAAI,CAAC,gBAAgB;aAClB,SAAS,CAAC,mBAAe,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC;aAClE,SAAS,CAAC,mBAAe,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;IACtE,CAAC;IA2CH,yBAAC;AAAD,CAAC,AA/DD,IA+DC;AAED,kBAAe,kBAAkB,CAAA"}
@@ -48,8 +48,9 @@ export declare type CreatePriceListInput = {
48
48
  }[];
49
49
  starts_at?: Date;
50
50
  ends_at?: Date;
51
+ includes_tax?: boolean;
51
52
  };
52
- export declare type UpdatePriceListInput = Partial<Pick<PriceList, "name" | "description" | "starts_at" | "ends_at" | "status" | "type">> & {
53
+ export declare type UpdatePriceListInput = Partial<Pick<PriceList, "name" | "description" | "starts_at" | "ends_at" | "status" | "type" | "includes_tax">> & {
53
54
  prices?: AdminPriceListPricesUpdateReq[];
54
55
  customer_groups?: {
55
56
  id: string;
@@ -1,10 +1,12 @@
1
- import { MoneyAmount, ProductVariant, Product, ShippingOption } from "../models";
2
- import { TaxServiceRate } from "./tax-service";
3
1
  import { PriceSelectionContext } from "../interfaces/price-selection-strategy";
2
+ import { MoneyAmount, Product, ProductVariant, ShippingOption } from "../models";
3
+ import { TaxServiceRate } from "./tax-service";
4
4
  export declare type ProductVariantPricing = {
5
5
  prices: MoneyAmount[];
6
6
  original_price: number | null;
7
7
  calculated_price: number | null;
8
+ original_price_includes_tax?: boolean | null;
9
+ calculated_price_includes_tax?: boolean | null;
8
10
  calculated_price_type?: string | null;
9
11
  } & TaxedPricing;
10
12
  export declare type TaxedPricing = {
@@ -22,6 +24,7 @@ export declare type PricingContext = {
22
24
  export declare type ShippingOptionPricing = {
23
25
  price_incl_tax: number | null;
24
26
  tax_rates: TaxServiceRate[] | null;
27
+ tax_amount: number;
25
28
  };
26
29
  export declare type PricedShippingOption = Partial<ShippingOption> & ShippingOptionPricing;
27
30
  export declare type PricedVariant = Partial<ProductVariant> & ProductVariantPricing;
@@ -9,6 +9,7 @@ export declare type UpdateRegionInput = {
9
9
  payment_providers?: string[];
10
10
  fulfillment_providers?: string[];
11
11
  countries?: string[];
12
+ includes_tax?: boolean;
12
13
  metadata?: Record<string, unknown>;
13
14
  };
14
15
  export declare type CreateRegionInput = {
@@ -19,5 +20,6 @@ export declare type CreateRegionInput = {
19
20
  payment_providers: string[];
20
21
  fulfillment_providers: string[];
21
22
  countries: string[];
23
+ includes_tax?: boolean;
22
24
  metadata?: Record<string, unknown>;
23
25
  };
@@ -36,6 +36,7 @@ export declare type CreateShippingOptionInput = {
36
36
  profile_id: string;
37
37
  provider_id: string;
38
38
  data: Record<string, unknown>;
39
+ includes_tax?: boolean;
39
40
  amount?: number;
40
41
  is_return?: boolean;
41
42
  admin_only?: boolean;
@@ -60,4 +61,5 @@ export declare type UpdateShippingOptionInput = {
60
61
  provider_id?: string;
61
62
  profile_id?: string;
62
63
  data?: string;
64
+ includes_tax?: boolean;
63
65
  };
@@ -1,13 +1,8 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.FeatureFlagEntity = exports.FeatureFlagDecorators = exports.FeatureFlagColumn = void 0;
7
- var medusa_core_utils_1 = require("medusa-core-utils");
8
4
  var typeorm_1 = require("typeorm");
9
- var feature_flags_1 = __importDefault(require("../loaders/feature-flags"));
10
- var path_1 = __importDefault(require("path"));
5
+ var feature_flags_1 = require("../loaders/feature-flags");
11
6
  /**
12
7
  * If that file is required in a non node environment then the setImmediate timer does not exists.
13
8
  * This can happen when a client package require a server based package and that one of the import
@@ -27,8 +22,7 @@ function FeatureFlagColumn(featureFlag, columnOptions) {
27
22
  if (columnOptions === void 0) { columnOptions = {}; }
28
23
  return function (target, propertyName) {
29
24
  setImmediate_(function () {
30
- var featureFlagRouter = getFeatureFlagRouter();
31
- if (!featureFlagRouter.isFeatureEnabled(featureFlag)) {
25
+ if (!feature_flags_1.featureFlagRouter.isFeatureEnabled(featureFlag)) {
32
26
  return;
33
27
  }
34
28
  (0, typeorm_1.Column)(columnOptions)(target, propertyName);
@@ -39,8 +33,7 @@ exports.FeatureFlagColumn = FeatureFlagColumn;
39
33
  function FeatureFlagDecorators(featureFlag, decorators) {
40
34
  return function (target, propertyName) {
41
35
  setImmediate_(function () {
42
- var featureFlagRouter = getFeatureFlagRouter();
43
- if (!featureFlagRouter.isFeatureEnabled(featureFlag)) {
36
+ if (!feature_flags_1.featureFlagRouter.isFeatureEnabled(featureFlag)) {
44
37
  return;
45
38
  }
46
39
  decorators.forEach(function (decorator) {
@@ -53,15 +46,10 @@ exports.FeatureFlagDecorators = FeatureFlagDecorators;
53
46
  function FeatureFlagEntity(featureFlag, name, options) {
54
47
  return function (target) {
55
48
  target["isFeatureEnabled"] = function () {
56
- var featureFlagRouter = getFeatureFlagRouter();
57
- return featureFlagRouter.isFeatureEnabled(featureFlag);
49
+ return feature_flags_1.featureFlagRouter.isFeatureEnabled(featureFlag);
58
50
  };
59
51
  (0, typeorm_1.Entity)(name, options)(target);
60
52
  };
61
53
  }
62
54
  exports.FeatureFlagEntity = FeatureFlagEntity;
63
- function getFeatureFlagRouter() {
64
- var configModule = (0, medusa_core_utils_1.getConfigFile)(path_1.default.resolve("."), "medusa-config").configModule;
65
- return (0, feature_flags_1.default)(configModule);
66
- }
67
55
  //# sourceMappingURL=feature-flag-decorators.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"feature-flag-decorators.js","sourceRoot":"","sources":["../../src/utils/feature-flag-decorators.ts"],"names":[],"mappings":";;;;;;AAAC,uDAAiD;AAClD,mCAAsE;AACtE,2EAAyD;AACzD,8CAAuB;AAItB;;;;;;GAMG;AACJ,IAAI,aAAa,CAAA;AACjB,IAAI;IACF,aAAa,GAAG,YAAY,CAAA;CAC7B;AAAC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI,CACV,qJAAqJ,CACtJ,CAAA;IACD,aAAa,GAAG,CAAC,UAAC,QAAoC,IAAK,OAAA,QAAQ,EAAE,EAAV,CAAU,CAAC,CAAA;CACvE;AAED,SAAgB,iBAAiB,CAC/B,WAAmB,EACnB,aAAiC;IAAjC,8BAAA,EAAA,kBAAiC;IAEjC,OAAO,UAAU,MAAM,EAAE,YAAY;QACnC,aAAa,CAAC;YACZ,IAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAA;YAEhD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE;gBACpD,OAAM;aACP;YAED,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAfD,8CAeC;AAED,SAAgB,qBAAqB,CACnC,WAAmB,EACnB,UAA+B;IAE/B,OAAO,UAAU,MAAM,EAAE,YAAY;QACnC,aAAa,CAAC;YACZ,IAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAA;YAEhD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE;gBACpD,OAAM;aACP;YAED,UAAU,CAAC,OAAO,CAAC,UAAC,SAA4B;gBAC9C,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAjBD,sDAiBC;AAED,SAAgB,iBAAiB,CAC/B,WAAmB,EACnB,IAAa,EACb,OAAuB;IAEvB,OAAO,UAAU,MAAgB;QAC/B,MAAM,CAAC,kBAAkB,CAAC,GAAG;YAC3B,IAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAA;YAEhD,OAAO,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QACxD,CAAC,CAAA;QACD,IAAA,gBAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC,CAAA;AACH,CAAC;AAbD,8CAaC;AAED,SAAS,oBAAoB;IACnB,IAAA,YAAY,GAAK,IAAA,iCAAa,EACpC,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EACjB,eAAe,CACkB,aAHf,CAGe;IAEnC,OAAO,IAAA,uBAAkB,EAAC,YAAY,CAAC,CAAA;AACzC,CAAC"}
1
+ {"version":3,"file":"feature-flag-decorators.js","sourceRoot":"","sources":["../../src/utils/feature-flag-decorators.ts"],"names":[],"mappings":";;;AAAA,mCAAsE;AACtE,0DAA4D;AAE3D;;;;;;GAMG;AACJ,IAAI,aAAa,CAAA;AACjB,IAAI;IACF,aAAa,GAAG,YAAY,CAAA;CAC7B;AAAC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI,CACV,qJAAqJ,CACtJ,CAAA;IACD,aAAa,GAAG,CAAC,UAAC,QAAoC,IAAK,OAAA,QAAQ,EAAE,EAAV,CAAU,CAAC,CAAA;CACvE;AAED,SAAgB,iBAAiB,CAC/B,WAAmB,EACnB,aAAiC;IAAjC,8BAAA,EAAA,kBAAiC;IAEjC,OAAO,UAAU,MAAM,EAAE,YAAY;QACnC,aAAa,CAAC;YACZ,IAAI,CAAC,iCAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE;gBACpD,OAAM;aACP;YAED,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAbD,8CAaC;AAED,SAAgB,qBAAqB,CACnC,WAAmB,EACnB,UAA+B;IAE/B,OAAO,UAAU,MAAM,EAAE,YAAY;QACnC,aAAa,CAAC;YACZ,IAAI,CAAC,iCAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE;gBACpD,OAAM;aACP;YAED,UAAU,CAAC,OAAO,CAAC,UAAC,SAA4B;gBAC9C,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAfD,sDAeC;AAED,SAAgB,iBAAiB,CAC/B,WAAmB,EACnB,IAAa,EACb,OAAuB;IAEvB,OAAO,UAAU,MAAgB;QAC/B,MAAM,CAAC,kBAAkB,CAAC,GAAG;YAC3B,OAAO,iCAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QACxD,CAAC,CAAA;QACD,IAAA,gBAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC,CAAA;AACH,CAAC;AAXD,8CAWC"}
@@ -1,6 +1,6 @@
1
1
  import { FeatureFlagsResponse, IFlagRouter } from "../types/feature-flags";
2
2
  export declare class FlagRouter implements IFlagRouter {
3
- private flags;
3
+ private readonly flags;
4
4
  constructor(flags: Record<string, boolean>);
5
5
  isFeatureEnabled(key: string): boolean;
6
6
  setFlag(key: string, value?: boolean): void;
@@ -1 +1 @@
1
- {"version":3,"file":"flag-router.js","sourceRoot":"","sources":["../../src/utils/flag-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAEA;IAGE,oBAAY,KAA8B;QAFlC,UAAK,GAA4B,EAAE,CAAA;QAGzC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,qCAAgB,GAAvB,UAAwB,GAAW;QACjC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IAEM,4BAAO,GAAd,UAAe,GAAW,EAAE,KAAY;QAAZ,sBAAA,EAAA,YAAY;QACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,CAAC;IAEM,8BAAS,GAAhB;QACE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YAAM,OAAA,CAAC;gBAC7D,GAAG,KAAA;gBACH,KAAK,OAAA;aACN,CAAC;QAH4D,CAG5D,CAAC,CAAA;IACL,CAAC;IACH,iBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,gCAAU"}
1
+ {"version":3,"file":"flag-router.js","sourceRoot":"","sources":["../../src/utils/flag-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAEA;IAGE,oBAAY,KAA8B;QAFzB,UAAK,GAA4B,EAAE,CAAA;QAGlD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,qCAAgB,GAAvB,UAAwB,GAAW;QACjC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IAEM,4BAAO,GAAd,UAAe,GAAW,EAAE,KAAY;QAAZ,sBAAA,EAAA,YAAY;QACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,CAAC;IAEM,8BAAS,GAAhB;QACE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YAAM,OAAA,CAAC;gBAC7D,GAAG,KAAA;gBACH,KAAK,OAAA;aACN,CAAC;QAH4D,CAG5D,CAAC,CAAA;IACL,CAAC;IACH,iBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,gCAAU"}
@@ -4,3 +4,5 @@ export * from "./validate-id";
4
4
  export * from "./generate-entity-id";
5
5
  export * from "./remove-undefined-properties";
6
6
  export * from "./is-defined";
7
+ export * from "./calculate-price-tax-amount";
8
+ export * from "./csv-cell-content-formatter";
@@ -20,4 +20,6 @@ __exportStar(require("./validate-id"), exports);
20
20
  __exportStar(require("./generate-entity-id"), exports);
21
21
  __exportStar(require("./remove-undefined-properties"), exports);
22
22
  __exportStar(require("./is-defined"), exports);
23
+ __exportStar(require("./calculate-price-tax-amount"), exports);
24
+ __exportStar(require("./csv-cell-content-formatter"), exports);
23
25
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,iDAA8B;AAC9B,gDAA6B;AAC7B,uDAAoC;AACpC,gEAA6C;AAC7C,+CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,iDAA8B;AAC9B,gDAA6B;AAC7B,uDAAoC;AACpC,gEAA6C;AAC7C,+CAA4B;AAC5B,+DAA4C;AAC5C,+DAA4C"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@medusajs/medusa",
3
- "version": "1.3.9",
3
+ "version": "1.4.0",
4
4
  "description": "E-commerce for JAMstack",
5
5
  "main": "dist/index.js",
6
6
  "bin": "./cli.js",
@@ -24,11 +24,9 @@
24
24
  "@types/multer": "^1.4.7",
25
25
  "babel-preset-medusa-package": "^1.1.19",
26
26
  "cross-env": "^5.2.1",
27
- "eslint": "^7.32.0",
28
27
  "jest": "^25.5.2",
29
28
  "medusa-interfaces": "^1.3.3",
30
29
  "nodemon": "^2.0.1",
31
- "prettier": "^1.19.1",
32
30
  "sqlite3": "^5.0.2",
33
31
  "supertest": "^4.0.2",
34
32
  "ts-jest": "^25.5.1",