@lancom/shared 0.0.248 → 0.0.249

package/assets/js/api/admin.js

@@ -132,34 +132,34 @@ export default {
     return _post(`admin/orders/pick-pdf`, { orders });
   },
   saveOrderSubsequentInvoice(order, invoice) {
-    return invoice._id ? _put(`admin/shop/${order.shop}/order/${order._id}/invoice/${invoice._id}`, invoice) : _post(`admin/shop/${order.shop}/order/${order._id}/invoice`, invoice);
+    return invoice._id ? _put(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/invoice/${invoice._id}`, invoice) : _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/invoice`, invoice);
   },
   sendOrderSubsequentInvoice(order, invoice) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/invoice/${invoice}/send`);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/invoice/${invoice}/send`);
   },
-  exportOrderToStarshipit(order, shipment) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/export-to-starshipit`, shipment);
+  exportOrderToShippingService(order, shipment) {
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/export-to-shipping-service`, shipment);
   },
   markShipmentAsDispatched(order, shipment) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/dispatched`, shipment);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/dispatched`, shipment);
   },
   markSubOrderAsDispatched(order, subOrder) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/sub-order/${subOrder._id}/dispatched`, subOrder);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/sub-order/${subOrder._id}/dispatched`, subOrder);
   },
   generateDuplicateOrderCode(order) {
     return _get(`admin/order/${order}/duplicate-code`);
   },
   sendShipmentTracking(order, shipment, tracking) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/tracking/${tracking._id}/send`, tracking);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/tracking/${tracking._id}/send`, tracking);
   },
-  removeShipmentFromStarshipit(order, shipment) {
-    return _delete(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}`);
+  removeShipment(order, shipment) {
+    return _delete(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}`);
   },
   calculateShipmentRates(order, shipment) {
-    return _get(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/calculate-shipping`);
+    return _get(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/calculate-shipping`);
   },
   createPrintLabels(order, shipment, rate) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/print-labels`, rate);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/print-labels`, rate);
   },
   createOrderRefund(order, refund, shop) {
     return _post(`shop/${shop}/order/${order}/refund`, refund);

package/assets/js/constants/country.js

@@ -1,4 +1,4 @@
 export const COUNTRIES_CODES = {
   Australia: 'AU',
-  'United Kingdom': 'UK'
+  'United Kingdom': 'GB'
 };

package/components/checkout/order/address-form/address-form.vue

@@ -203,7 +203,7 @@
           <input
             id="country"
             ref="country"
-            value="Only Australia"
+            :value="address.country === 'Australia' ? 'Only Australia' : address.country"
             name="country"
             type="country"
             class="form-field filled labelless"
@@ -296,6 +296,7 @@ export default {
         this.$set(this.address, 'state', suburb.state);
         this.$set(this.address, 'postcode', suburb.postcode);
         this.$set(this.address, 'city', suburb.locality);
+        this.$set(this.address, 'country', suburb.country);
       }
     },
     handleSuburbChange(suburb) {

package/components/checkout/order/order.vue

@@ -98,7 +98,7 @@ export default {
       company: null,
       additionalInfo: null,
       suburb: null,
-      country: 'Australia',
+      country: null,
       state: null,
       postcode: null
     };

package/components/common/postcode_select/postcode-select.vue

@@ -88,6 +88,9 @@ export default {
   },
   filters: { highlight },
   props: {
+    country: {
+      type: Object
+    },
     value: {
       type: String
     },
@@ -147,7 +150,8 @@ export default {
     async handleSearch(query) {
       if (query.length) {
         this.isLoading = true;
-        this.suburbs = await api.fetchSuburbs({ query });
+        const country = this.country ? (this.country.isoCode === 'GB' ? 'England' : (this.country.name || this.country)) : 'Australia';
+        this.suburbs = await api.fetchSuburbs({ query, country });
         this.options = this.suburbs.map(this.createOptionFromSuburb);
         this.isLoading = false;
       } else {

package/components/design/approve_design_header/approve-design-header.vue

@@ -36,7 +36,7 @@
           {{ order.postcode }},
           {{ order.state }},
           {{ order.city }},
-          Australia
+          {{ order.country || 'Australia'}}
         </span>
       </div>
     </div>

package/components/modals/order_modal/order-modal.vue

@@ -127,11 +127,11 @@
             {{ errors[0] }}
           </span>
         </validation-provider>
-        <div class="form-row">
+        <div v-if="suburb" class="form-row">
           <input
             id="country"
             ref="country"
-            value="Only Australia"
+            :value="suburb.country"
             name="country"
             type="country"
             class="form-field filled labelless"
@@ -303,6 +303,9 @@ export default {
   mounted() {
     if (this.orderData) {
       this.form = {
+        state: null,
+        country: null,
+        postcode: null,
         city: this.orderData.city,
         phone: this.orderData.phone,
         addressLine1: this.orderData.addressLine1,
@@ -325,8 +328,18 @@ export default {
     ...mapActions('cart', [
       'calculateCartPrice'
     ]),
+    setAddressSuburb(suburb) {
+      this.$set(this.form, 'suburb', suburb);
+      if (suburb) {
+        this.$set(this.form, 'state', suburb.state);
+        this.$set(this.form, 'postcode', suburb.postcode);
+        this.$set(this.form, 'city', suburb.locality);
+        this.$set(this.form, 'country', suburb.country);
+      }
+    },
     handleSuburbChange(suburb) {
       this.form.suburb = suburb;
+      this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
       this.calculateCartPrice({ shop: this.shop });
     },
@@ -335,6 +348,7 @@ export default {
     },
     async submit() {
       try {
+        debugger;
         this.processing = true;
         const recaptchaToken = await this.getRecaptcha('create_order');
         await this.createOrder({

package/components/quotes/quote_request/quote-request.vue

@@ -354,7 +354,7 @@ export default {
           email: '',
           phone: '',
           suburb: null,
-          country: 'Australia'
+          country: null
         },
         expectedItemsQuantity: null,
         description: '',

package/feeds/google-shopping.js

@@ -2,7 +2,10 @@ async function googleLocalShoppingFeed(axios, config, availableStores) {
   const result = await googleShoppingFeed(axios, config, availableStores);
   
   const fields = [
+    // 'title',
+    // 'description',
     'g:availability',
+    // 'g:link_template',
     'g:id',
     'g:pickup_method',
     'g:pickup_sla',
@@ -11,7 +14,11 @@ async function googleLocalShoppingFeed(axios, config, availableStores) {
     'g:store_code'
   ];
   result.rss.channel.item = result.rss.channel.item
-    .map(i => fields.reduce((item, field) => ({ ...item, [field]: i[field] }), {}));
+    .map(i => fields
+      .reduce((item, field) => ({
+        ...item,
+        [field]: i[field],
+      }), {}));
   return result;
 }
 async function googleShoppingFeed(axios, config, availableStores) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.248",
+  "version": "0.0.249",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/plugins/cache-headers.js

@@ -0,0 +1,4 @@
+module.exports = function (req, res, next) {
+  res.setHeader('Cache-Control', `max-age=${86400}`); // 1 day
+  next();
+};