bill 11 часов назад
Родитель
Сommit
5cb28c1174

+ 1 - 1
src/ui-refactor/views/guest-shop/GuestPurchaseFlow.vue

@@ -119,7 +119,7 @@
             :tax="totals.tax"
             :currency="currency"
             :shipping="
-              stage === 'cart' || (settingsReady && Number(freight) === 0)
+              stage === 'cart' || stage === 'checkout' || (settingsReady && Number(freight) === 0)
                 ? 'To be determined'
                 : currency + ' ' + totals.shipping.toFixed(2)
             "

+ 2 - 2
src/ui-refactor/views/purchase/PurchaseFlow.vue

@@ -286,7 +286,7 @@
           :total="stage === 'cart' ? sellPriceSum : orderTotal"
           :currency="currencyUnitCode"
           :shipping="
-            stage === 'cart' || (!isUpgrade && settingsReady && Number(freight) === 0)
+            stage === 'cart' || stage === 'checkout' || (!isUpgrade && settingsReady && Number(freight) === 0)
               ? 'To be determined'
               : currencyUnitCode + ' ' + (isUpgrade ? '0.00' : pointFreight)
           "
@@ -397,7 +397,7 @@ export default {
   },
   computed: {
     stockistCountryId() {
-      return this.isSelf ? this.accountCountryId : this.memberDetails?.countryId
+      return this.isSelf ? usersInfo.baseData()?.COUNTRY_ID : this.memberDetails?.countryId
     },
     ...behavior.computed,
     isEmptyCart() {