@darkpos/pricing 1.0.76 → 1.0.77

package/__TEST__/order/pickEndDate.test.js

@@ -19,10 +19,9 @@ describe('pickEndDate function', () => {
   test('Get EndDate, today is an Skip date', () => {
     const schedule = {
       addDays: 1,
-      hour: 17,
-      minute: 0,
       skipDays: [7],
       cutHour: { hour: 16, minute: 0 },
+      readyHour: { hour: 17, minute: 0 },
       cutDay: 2,
     };
 
@@ -37,8 +36,7 @@ describe('pickEndDate function', () => {
   test('Order falls on a closed day', () => {
     const schedule = {
       addDays: 1,
-      hour: 14,
-      minute: 0,
+      readyHour: { hour: 14, minute: 0 },
       skipDays: [7], // Skip Sunday
       cutHour: { hour: 16, minute: 0 },
       cutDay: 2,
@@ -55,8 +53,7 @@ describe('pickEndDate function', () => {
   test('Get endDate if today is friday and Saturday and Sunday are skip days', () => {
     const schedule = {
       addDays: 1,
-      hour: 17,
-      minute: 0,
+      readyHour: { hour: 17, minute: 0 },
       skipDays: [6, 7], // Skip Saturday and Sunday
       cutHour: { hour: 16, minute: 0 },
       cutDay: 5,
@@ -73,8 +70,7 @@ describe('pickEndDate function', () => {
   test('Order time before cut-off hour', () => {
     const schedule = {
       addDays: 0, // Same day
-      hour: 17,
-      minute: 0,
+      readyHour: { hour: 17, minute: 0 },
       skipDays: [],
       cutHour: { hour: 16, minute: 0 }, // Cut-off at 4 PM
       cutDay: 5,
@@ -90,18 +86,13 @@ describe('pickEndDate function', () => {
 
   test('Order time after cut-off hour', () => {
     const schedule = {
-      hour: 17,
-      minute: 0,
+      readyHour: { hour: 17, minute: 0 },
       cutDay: 5,
       skipDays: [],
       cutHour: {
         hour: 0,
         minute: 0,
       },
-      time: {
-        hour: 16,
-        minute: 0,
-      },
       addDays: 1,
       recommended: 'nothing_recommended',
     };
@@ -117,8 +108,7 @@ describe('pickEndDate function', () => {
   test('Get EndDate, there are skip dates in between', () => {
     const schedule = {
       addDays: 1,
-      hour: 17,
-      minute: 0,
+      readyHour: { hour: 17, minute: 0 },
       skipDays: [7, 0],
       cutHour: { hour: 16, minute: 0 },
       cutDay: 2,
@@ -135,8 +125,7 @@ describe('pickEndDate function', () => {
   test('Get EndDate, Now date is an skip day', () => {
     const schedule = {
       addDays: 1,
-      hour: 20,
-      minute: 0,
+      readyHour: { hour: 20, minute: 0 },
       skipDays: [1, 7],
       cutHour: { hour: 16, minute: 0 },
       cutDay: 2,

package/lib/store/getRecommendedEndDate.js

@@ -1,13 +1,22 @@
 module.exports = ({ actions, settings }) =>
   function getRecommendedEndDate() {
-    const defaultSchedule =
+    const readySchedule =
       settings.order &&
       settings.order.endDate &&
-      settings.order.endDate.default;
+      settings.order.endDate.readySchedule;
 
-    return defaultSchedule
-      ? actions.pickEndDate({
-          ...defaultSchedule,
-        })
-      : null;
+    if (readySchedule) {
+      const dayOfWeek = new Date().getDay();
+      const day = dayOfWeek || 7;
+      const schedule = settings.order.endDate.readySchedule.find(item =>
+        item.dayOfWeek.includes(day)
+      );
+      return schedule
+        ? actions.pickEndDate({
+            ...schedule,
+          })
+        : null;
+    }
+
+    return null;
   };

package/lib/store/pickEndDate.js

@@ -13,8 +13,7 @@ module.exports = ({ settings, _, moment }) => {
   return function pickEndDate(schedule = {}) {
     const {
       addDays: addDaysParam,
-      hour,
-      minute,
+      readyHour,
       skipDays = [],
       cutHour,
       cutDay = 0,
@@ -33,13 +32,16 @@ module.exports = ({ settings, _, moment }) => {
 
     if (
       (cutHour && todayHours > cutHour.hour) ||
-      (todayHours >= cutHour.hour && todayMinutes > cutHour.minute)
+      (cutHour && todayHours >= cutHour.hour && todayMinutes > cutHour.minute)
     ) {
       endDateTZ = endDateTZ.add(cutDay, 'days');
     }
 
-    if (hour !== undefined) endDateTZ.set('hour', hour);
-    if (minute !== undefined) endDateTZ.set('minute', minute);
+    if (readyHour && readyHour.hour !== undefined)
+      endDateTZ.set('hour', readyHour.hour);
+    if (readyHour && readyHour.minute !== undefined)
+      endDateTZ.set('minute', readyHour.minute);
+
     endDateTZ.set('second', 0);
 
     const isSkipDay = endDateIsoWeekDay => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "195250ff6ff1f2b38a7c47003006b8d2dcb2048b"
+  "gitHead": "5ef669119ac8baec449e3c0aee06151d0cd4ad63"
 }