@lancom/shared 0.0.309 → 0.0.310

package/assets/scss/ui_kit/_grid.scss

@@ -783,7 +783,7 @@
   margin-left: auto !important;
 }
 // margins
-@for $i from 1 through 10 {
+@for $i from 1 through 20 {
   .mt-#{$i} {
     margin-top: #{$i}px !important;
   }

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

@@ -14,4 +14,12 @@
       }
     }
   }
+}
+
+.CustomerAddressForm {
+  &__copy-btn {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+  }
 }

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

@@ -258,6 +258,9 @@ export default {
       type: Object,
       required: true
     },
+    copyFrom: {
+      type: Object
+    },
     withoutAdditionalInfo: {
       type: Boolean,
       default: false

package/components/checkout/order/order-billing-information/order-billing-information.vue

@@ -11,17 +11,20 @@
           <address-form
             :address="order.shippingAddress"
             :without-additional-info="true" />
-          <checkbox
-            v-model="copyToBillingAddress"
-            :dark="true">
-            <div class="ml-5">Use same address as the billing address</div>
-          </checkbox>
+          <div class="mt-20 mb-20">
+            <checkbox
+              v-model="copyToBillingAddress"
+              :dark="true">
+              <div class="ml-5">Use same address as the billing address</div>
+            </checkbox>
+          </div>
           <div
             v-if="!copyToBillingAddress"
-            class="mt-7">
-            <h5 class="lc_h4 mb-7">Billind Address</h5>
+            class="mt-15">
+            <h5 class="lc_h3 lc_uppercase lc_bold mt-10 mb-15">Billing Address</h5>
             <address-form
               :address="order.billingAddress"
+              :copy-from="order.shippingAddress"
               :without-additional-info="true" />
           </div>
         </div>
@@ -46,6 +49,27 @@ import CartMixin from '@lancom/shared/components/checkout/cart/cart.mixin';
 import AddressForm from '@/components/checkout/order/address-form/address-form';
 import ProgressStepsControls from '@lancom/shared/components/common/progress_steps/progress_steps_controls/progress-steps-controls';
 
+function isSameAddresses(address, billingAddress) {
+  if (!billingAddress) {
+    return true;
+  }
+  const fields = [
+    'fullName',
+    'additionalInfo',
+    'addressLine1',
+    'addressLine2',
+    'city',
+    'company',
+    'country',
+    'email',
+    'phone',
+    'postcode',
+    'state'
+  ];
+  const getKey = model => fields.reduce((v, field) => `${v}-${model[field] || ''}`, '');
+  return address && getKey(address) === getKey(billingAddress);
+}
+
 export default {
   name: 'OrderBillingInformation',
   mixins: [CartMixin],
@@ -62,7 +86,7 @@ export default {
   },
   data() {
     return {
-      copyToBillingAddress: true,
+      copyToBillingAddress: isSameAddresses(this.order?.shippingAddress, this.order?.billingAddress),
       isSubmit: false
     };
   },

package/components/checkout/order/order.vue

@@ -106,7 +106,7 @@ export default {
     this.order = {
       paymentMethod: 'card',
       billingAddress: {
-        ...address,
+        ...JSON.parse(JSON.stringify(address)),
         ...(this.user ? {
           fullName: `${this.user.firstName} ${this.user.lastName}`,
           phone: this.user.phone,

package/components/common/product_side_with_print/product-side-with-print.vue

@@ -81,7 +81,7 @@ export default {
       return this.print && this.getImageBackground(this.print);
     },
     image() {
-      const color = this.defaultPreview ? null : this.product.color;
+      const color = this.defaultPreview ? null : (this.product.color || (this.product.colors || [])[0]);
       const product = this.product?.product || this.product;
       return getColorImage(product, this.size, this.side, color) || getProductCover(product, this.size, this.side, color);
     },

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

@@ -361,7 +361,7 @@ export default {
           recaptchaToken,
           currency: this.currency?._id,
           country: this.country?._id,
-          billingAddress: this.form,
+          billingAddress: JSON.parse(JSON.stringify(this.form)),
           shippingAddress: this.form,
           products: this.entities,
           pricing: this.cartPricing,

package/components/order/order_product_prints_preview/order-product-prints-preview.vue

@@ -7,6 +7,7 @@
         <product-side-with-print
           :product="product"
           :side="side"
+          :default-preview="defaultPreview"
           size="medium" />
       </div>
     </div>
@@ -29,6 +30,10 @@ export default {
     product: {
       type: Object,
       required: true
+    },
+    defaultPreview: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {

package/package.json

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

package/store/product.js

@@ -205,7 +205,9 @@ export const actions = {
   },
   async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, { shop, country, currency }) {
     commit('setCalculatingPrice', true);
-    const entities = getProductsForCalculatePricing(product, getters.usedSimpleProducts, template.layers, isPrintPricing, true);
+    const spProducts = getters.usedSimpleProducts?.length > 0 ? getters.usedSimpleProducts : (getters.defaultSimpleProduct ? [{ ...getters.defaultSimpleProduct, amount: 1 }] : []);
+    const entities = getProductsForCalculatePricing(product, spProducts, template.layers, isPrintPricing, true);
+
     const response = await api.calculateProductPrice({ entities, country: country?._id, currency: currency?._id }, shop._id);
     commit('setProductPricing', response);
     commit('setCalculatingPrice', false);