Merge branch 'release/1.2.6'

README.md

@@ -2,12 +2,12 @@
 **Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988), [wedevs](https://profiles.wordpress.org/wedevs), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu)
 **Donate Link:** http://tareq.co/donate/
 **Tags:** WooCommerce POS, point of sale, free pos, pos plugin, woocommerce point of sale
-**Requires at least:** 4.4
-**Tested up to:** 6.0.3
-**WC requires at least:** 3.0
-**WC tested up to:** 7.0.0
-**Requires PHP:** 5.6
-**Stable tag:** 1.2.5
+**Requires at least:** 5.4
+**Tested up to:** 6.1.1
+**WC requires at least:** 5.0.0
+**WC tested up to:** 7.2.2
+**Requires PHP:** 7.2
+**Stable tag:** 1.2.6
 **License:** GPLv2 or later
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -60,6 +60,12 @@ No FAQ
 
 ## Changelog ##
 
+### v1.2.6 -> 30 December, 2022 ###
+- **New:** Integrated Vue date range picker, select2 and Vue chart JS packages
+- **New:** Added helper methods for getting day JS and date range picker date formats
+- **New:** Added helper method for getting custom date ranges
+- **Refactor:** Order created via wePOS setter
+
 ### v1.2.5 -> 02 November, 2022 ###
 - **Feature:** "View POS" menu on "My Account" page
 - **Enhancement:** Added all decimal separator support as per wooCommerce settings to put a discount or adding a fee from POS frontend

assets/src/utils/Bootstrap.js

@@ -12,6 +12,10 @@ import Multiselect from 'vue-multiselect'
 import Modal from './components/Modal.vue'
 import Switches from './components/Switches.vue'
 import "vue-multiselect/dist/vue-multiselect.min.css"
+import * as VueChartJS from 'vue-chartjs'
+
+import * as Date_Helper from './date-helper';
+window.Date_Helper = Date_Helper;
 
 import dayjs from 'dayjs';
 window.dayjs = dayjs;
@@ -28,6 +32,9 @@ Vue.use(VueDatePicker, {
     lang: 'en'
 });
 
+import DateRangePicker from 'vue2-daterange-picker';
+import 'vue2-daterange-picker/dist/vue2-daterange-picker.css';
+
 Vue.directive( 'tooltip', VTooltip )
 Vue.directive( 'close-popover', VClosePopover )
 Vue.component( 'v-popover', VPopover )
@@ -73,16 +80,18 @@ window.wepos_get_lib = function( lib ) {
 
 export const EventBus = new Vue();
 
-window.weLo_                    = _;
-window.wepos._                  = _;
-window.wepos.api                = new API_Helper();
-window.wepos.libs['Vue']        = Vue;
-window.wepos.libs['Router']     = Router;
-window.wepos.libs['Vuex']       = Vuex;
-window.wepos.libs['TextEditor'] = TextEditor;
-window.wepos.libs['EventBus']   = EventBus;
-window.wepos.libs['Modal']      = Modal;
-window.wepos.libs['Switches']   = Switches;
+window.weLo_                         = _;
+window.wepos._                       = _;
+window.wepos.api                     = new API_Helper();
+window.wepos.libs['Vue']             = Vue;
+window.wepos.libs['Router']          = Router;
+window.wepos.libs['Vuex']            = Vuex;
+window.wepos.libs['TextEditor']      = TextEditor;
+window.wepos.libs['EventBus']        = EventBus;
+window.wepos.libs['Modal']           = Modal;
+window.wepos.libs['Switches']        = Switches;
+window.wepos.libs['DateRangePicker'] = DateRangePicker;
+window.wepos.libs['VueChartJS']      = VueChartJS;
 
 // WordPress Hooks
 import { createHooks } from '@wordpress/hooks';

assets/src/utils/date-helper.js

@@ -0,0 +1,123 @@
+/**
+ * Get DayJS supported date format.
+ *
+ * @since WEPOS_LITE_SINCE
+ *
+ * @param {string} dateFormat The date format to convert
+ *
+ * @return {string} DayJS supported date format
+ */
+export function wepos_get_dayjs_date_format( dateFormat = wepos.wp_date_format ) {
+    let formatMap = {
+        // Day
+        d: 'DD',
+        D: 'ddd',
+        j: 'D',
+        // Month
+        F: 'MMM',
+        m: 'MM',
+        M: 'MMM',
+        n: 'M',
+        // Year
+        Y: 'YYYY',
+        y: 'YY'
+    }
+
+    let dayJsDateFormat = '';
+
+    for ( let i = 0; i < dateFormat.length; i++ ) {
+        const char = dateFormat[i];
+
+        dayJsDateFormat += formatMap[char] ? formatMap[char] : char;
+    }
+
+    return dayJsDateFormat;
+}
+
+/**
+ * Get date range picker supported date format.
+ *
+ * @since WEPOS_LITE_SINCE
+ *
+ * @param {string} dateFormat The date format to convert
+ *
+ * @return {string} Date range picker supported date format
+ */
+export function wepos_get_daterange_picker_date_format( dateFormat = wepos.wp_date_format ) {
+    let formatMap = {
+        // Day
+        d: 'dd',
+        D: 'ddd',
+        j: 'd',
+        // Month
+        F: 'mmmm',
+        m: 'mm',
+        M: 'mmm',
+        n: 'm',
+        // Year
+        Y: 'yyyy',
+        y: 'yy'
+    }
+
+    let dateRangePickerFormat = '';
+
+    for ( let i = 0; i < dateFormat.length; i++ ) {
+        const char = dateFormat[i];
+
+        dateRangePickerFormat += formatMap[char] ? formatMap[char] : char;
+    }
+
+    return dateRangePickerFormat;
+}
+
+/**
+ * Get custom date ranges.
+ *
+ * @since WEPOS_LITE_SINCE
+ *
+ * @param {string} dateContext The date context
+ *
+ * @return {array} Date range
+ */
+export function wepos_get_custom_date_ranges( dateContext = "this year" ) {
+    let dateRange = [];
+
+    switch ( dateContext ) {
+        case "today":
+            dateRange["start"] = dayjs().startOf('day').toDate();
+            dateRange["end"]   = dayjs().endOf('day').toDate();
+            break;
+
+        case "yesterday":
+            dateRange["start"] = dayjs().subtract( 1, 'days' ).startOf( 'day' ).toDate();
+            dateRange["end"]   = dayjs().subtract( 1, 'days' ).endOf( 'day' ).toDate();
+            break;
+
+        case "this week":
+            dateRange["start"] = dayjs().startOf( 'week' ).toDate();
+            dateRange["end"]   = dayjs().endOf( 'week' ).toDate();
+            break;
+
+        case "this month":
+            dateRange["start"] = dayjs().startOf( 'month' ).toDate();
+            dateRange["end"]   = dayjs().endOf( 'month' ).toDate();
+            break;
+
+        case "this quarter":
+            dateRange["start"] = dayjs().startOf( 'quarter' ).toDate();
+            dateRange["end"]   = dayjs().endOf( 'quarter' ).toDate();
+            break;
+
+        case "last month":
+            dateRange["start"] = dayjs().subtract( 1, 'months' ).startOf( 'month' ).toDate();
+            dateRange["end"]   = dayjs().subtract( 1, 'months' ).endOf( 'month' ).toDate();
+            break;
+
+        case "this year":
+        default:
+            dateRange["start"] = dayjs().startOf( 'year' ).toDate();
+            dateRange["end"]   = dayjs().endOf( 'year' ).toDate();
+    }
+
+    return dateRange;
+}

composer.json

@@ -11,7 +11,8 @@
   ],
   "minimum-stability": "dev",
   "require": {
-    "appsero/client": "dev-master",
+    "php": ">=7.2",
+    "appsero/client": "dev-develop",
     "ext-json": "*"
   },
   "require-dev": {
@@ -30,5 +31,13 @@
     "phpcbf": [
       "phpcbf -p"
     ]
+  },
+  "config": {
+    "platform": {
+      "php": "7.2"
+    },
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }

includes/Admin/Admin.php

@@ -69,10 +69,12 @@ public function enqueue_scripts() {
         wp_enqueue_style( 'wepos-style' );
         wp_enqueue_style( 'wepos-bootstrap' );
         wp_enqueue_style( 'wepos-admin' );
+        wp_enqueue_style( 'wepos-select2' );
 
         wp_enqueue_script( 'wepos-tinymce-plugin' );
         wp_enqueue_script( 'wepos-vendor' );
         wp_enqueue_script( 'wepos-blockui' );
+        wp_enqueue_script( 'wepos-select2' );
 
         wp_enqueue_script( 'wepos-bootstrap' );
         do_action( 'wepos_load_admin_scripts' );