@chevre/domain 21.2.0-alpha.67 → 21.2.0-alpha.68

package/lib/chevre/service/transaction/returnOrder.js

@@ -237,6 +237,7 @@ function findApplicableReturnPolicy(params) {
     let applicalbleReturnPolicies = [];
     if (params.reason === factory.transaction.returnOrder.Reason.Customer) {
         // 適用可能なポリシーにフィルター
+        // tslint:disable-next-line:max-func-body-length
         applicalbleReturnPolicies = returnPolicies.filter((returnPolicy) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             let satisfyMerchantReturnDays = false;
@@ -285,7 +286,7 @@ function findApplicableReturnPolicy(params) {
                 if (typeof gracePeriodMinValue === 'number') {
                     satisfyGracePeriodMinValue = params.events.every((event) => {
                         return moment(event.startDate)
-                            .isSameOrAfter(moment(params.returningDate)
+                            .isAfter(moment(params.returningDate)
                             .add(gracePeriodMinValue, 'seconds'));
                     });
                 }
@@ -293,16 +294,17 @@ function findApplicableReturnPolicy(params) {
                 if (typeof (gracePeriodBeforeStartInDaysMax === null || gracePeriodBeforeStartInDaysMax === void 0 ? void 0 : gracePeriodBeforeStartInDaysMax.period.value) === 'number'
                     && typeof gracePeriodBeforeStartInDaysMax.time === 'string') {
                     satisfyGracePeriodInDaysMax = params.events.every((event) => {
-                        const minDate = moment(event.startDate)
+                        const maxDate = moment(event.startDate)
                             .tz(gracePeriodBeforeStartInDaysMax.timezone)
                             .startOf('days')
                             .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
                             .format('YYYY-MM-DD');
-                        const returnMinDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMax.time}`)
-                            .tz(gracePeriodBeforeStartInDaysMax.timezone);
+                        const returnMinDate = moment.tz(`${maxDate}T${gracePeriodBeforeStartInDaysMax.time}`, gracePeriodBeforeStartInDaysMax.timezone);
+                        debug('returnMinDate:', returnMinDate, 'returningDate:', returningDate);
                         return returnMinDate.isSameOrBefore(moment(returningDate));
                     });
                 }
+                debug('gracePeriodBeforeStartInDaysMax:', gracePeriodBeforeStartInDaysMax);
                 const gracePeriodBeforeStartInDaysMin = (_j = (_h = offerItemCondition.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservationFor.gracePeriodBeforeStartInDays) === null || _j === void 0 ? void 0 : _j.min;
                 if (typeof (gracePeriodBeforeStartInDaysMin === null || gracePeriodBeforeStartInDaysMin === void 0 ? void 0 : gracePeriodBeforeStartInDaysMin.period.value) === 'number'
                     && typeof gracePeriodBeforeStartInDaysMin.time === 'string') {
@@ -314,7 +316,7 @@ function findApplicableReturnPolicy(params) {
                             .format('YYYY-MM-DD');
                         const returnMaxDate = moment.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
                         debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
-                        return returnMaxDate.isSameOrAfter(moment(returningDate));
+                        return returnMaxDate.isAfter(moment(returningDate));
                     });
                 }
                 debug('satisfyGracePeriodInDaysMin:', satisfyGracePeriodInDaysMin);

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.67"
+  "version": "21.2.0-alpha.68"
 }