feat: #49 (*) update totals in cartPreview

vuestorefront-community · Aug 22, 2021 · 70d9e29 · 70d9e29
1 parent c03bf85
commit 70d9e29
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/packages/composables/src/composables/useShippingProvider/index.ts b/packages/composables/src/composables/useShippingProvider/index.ts
@@ -14,10 +14,6 @@ const params: UseShippingProviderParams<ShippingProvider, ShippingMethod> = {
     console.log('Mocked: saveShippingProvider');
     return {};
   }
-
-  set: async (context: Context) => {
-    // Set Cart value to a new returned from setShippingMethod
-  }
 };
 
 export const useShippingProvider = useShippingProviderFactory<ShippingProvider, ShippingMethod>(params);
diff --git a/packages/composables/src/getters/cartGetters.ts b/packages/composables/src/getters/cartGetters.ts
@@ -44,7 +44,7 @@ const getItemSku = (item: OrderLine): string => {
 
 const getTotals = (cart: Order): AgnosticTotals => {
   return {
-    total: createPrice(cart?.subTotal),
+    total: createPrice(cart?.totalWithTax),
     subtotal: createPrice(cart?.subTotalWithTax)
   };
 };

diff --git a/packages/theme/components/Checkout/CartPreview.vue b/packages/theme/components/Checkout/CartPreview.vue
@@ -37,7 +37,7 @@
       />
       <SfProperty
         :name="$t('Total')"
-        :value="$n(totals.subtotal, 'currency')"
+        :value="$n(totals.total, 'currency')"
         class="sf-property--full-width sf-property--large property-total"
       />
     </div>

diff --git a/packages/theme/components/Checkout/VsfShippingProvider.vue b/packages/theme/components/Checkout/VsfShippingProvider.vue
@@ -101,7 +101,7 @@ export default {
   setup (props, { emit }) {
     const shippingMethods = ref([]);
     const { $vendure } = useVSFContext();
-    const { cart } = useCart();
+    const { cart, setCart } = useCart();
     const {
       state,
       load,
@@ -116,7 +116,8 @@ export default {
     });
 
     const selectShippingMethod = async shippingMethod => {
-      await $vendure.api.setShippingMethod({ shippingMethodId: shippingMethod.id })
+      const newOrder = await $vendure.api.setShippingMethod({ shippingMethodId: shippingMethod.id })
+      setCart(newOrder.data.setOrderShippingMethod);
       selectedShippingMethod.value = shippingMethod;
       emit('shippingMethodSelected', shippingMethod);
     };