Merge branch 'master' into master

rapidez · Mar 13, 2024 · 3d1cc80 · 3d1cc80
2 parents b5c1f2a + 4dce84e
commit 3d1cc80
Show file tree

Hide file tree

Showing 24 changed files with 304 additions and 139 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,20 +1,38 @@
 # Changelog 
 
-[Unreleased changes](https://github.com/rapidez/checkout-theme/compare/1.3.0...master)
+[Unreleased changes](https://github.com/rapidez/checkout-theme/compare/2.0.0...master)
+## [2.0.0](https://github.com/rapidez/checkout-theme/releases/tag/2.0.0) - 2024-03-13
+
+### Added
+
+- Rapidez v2 compatibility (#68)
+
+## [1.4.0](https://github.com/rapidez/checkout-theme/releases/tag/1.4.0) - 2024-03-12
+
+### Added
+
+- Allow address cards to be disabled (#69)
+- Newsletter subscription on checkout success (#60)
+- Fire postcode change events (#71)
+
+### Fixed
+
+- Add SKU to product listing in account orders (#70)
+
 ## [1.3.0](https://github.com/rapidez/checkout-theme/releases/tag/1.3.0) - 2024-01-30
 
 ### Added
 
- - Add option to make the user create an address during registration (https://github.com/rapidez/checkout-theme/pull/63)
- - Show a button to select address + frontend validation if default address is missing (https://github.com/rapidez/checkout-theme/pull/64)
+ - Add option to make the user create an address during registration (#63)
+ - Show a button to select address + frontend validation if default address is missing (#64)
 
 ### Changed
 
- - Add newsletter to checkout & splice up cart products listing into separate parts (https://github.com/rapidez/checkout-theme/pull/62)
+ - Add newsletter to checkout & splice up cart products listing into separate parts (#62)
 
 ### Bugfix
 
-- Use proper config path (but still keep fallback) (https://github.com/rapidez/checkout-theme/pull/65)
+- Use proper config path (but still keep fallback) (#65)
 
 
 

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^8.0|^8.1|^8.2",
         "blade-ui-kit/blade-heroicons": "^2.0",
-        "rapidez/core": "^1.0"
+        "rapidez/core": "^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/resources/js/components/AddressCard.vue b/resources/js/components/AddressCard.vue
@@ -4,6 +4,8 @@
             address: Object,
             shipping: Boolean,
             billing: Boolean,
+            disabled: Boolean,
+            check: Boolean,
         },
 
         render() {

diff --git a/resources/views/account/partials/order/products.blade.php b/resources/views/account/partials/order/products.blade.php
@@ -24,6 +24,9 @@ class="max-h-[100px] max-w-[150px]"
             </div>
             <div class="flex w-[150px] flex-1 flex-col items-start">
                 <a :href="item.url" dusk="cart-item-name">@{{ item.product_name }}</a>
+                <div class="text-xs text-ct-inactive">
+                    @{{ item.product_sku }}
+                </div>
                 <div v-for="(optionValue, option) in item.options">
                     @{{ option }}: @{{ optionValue }}
                 </div>

diff --git a/resources/views/account/partials/register-account-address.blade.php b/resources/views/account/partials/register-account-address.blade.php
@@ -46,7 +46,14 @@
                 </div>
                 @if(Rapidez::config('customer/address/street_lines', 2) >= 2)
                     <div class="flex-1">
-                        <x-rapidez-ct::input name="street[1]" type="number" label="Housenumber" v-model="addressVariables.street[1]" placeholder="" />
+                        <x-rapidez-ct::input
+                            name="street[1]"
+                            type="number"
+                            label="Housenumber"
+                            v-model="addressVariables.street[1]"
+                            v-on:change="window.app.$emit('postcode-change', addressVariables)"
+                            placeholder=""
+                        />
                     </div>
                 @endif
                 @if(Rapidez::config('customer/address/street_lines', 2) >= 3)
@@ -61,7 +68,13 @@
                 @endif
             </div>
 
-            <x-rapidez-ct::input name="postcode" label="Postcode" v-model="addressVariables.postcode" required />
+            <x-rapidez-ct::input
+                name="postcode"
+                label="Postcode"
+                v-model="addressVariables.postcode"
+                v-on:change="window.app.$emit('postcode-change', addressVariables)"
+                required
+            />
             <x-rapidez-ct::input name="city" label="City" v-model="addressVariables.city" required />
             <span class="relative flex flex-col gap-y-1.5 sm:gap-y-2 text-sm !mb-3">
                 <x-rapidez-ct::input.label :required="true">
@@ -71,6 +84,7 @@
                     name="country_code"
                     label="Country"
                     v-model="addressVariables.country_code"
+                    v-on:change="window.app.$emit('postcode-change', addressVariables)"
                     class="w-full"
                     required
                 />

diff --git a/resources/views/cart/coupon.blade.php b/resources/views/cart/coupon.blade.php
@@ -1,32 +1,64 @@
 <toggler>
     <div slot-scope="{ isOpen, toggle }">
-        <coupon v-show="isOpen" v-slot="{ cart, removeCoupon, couponCode, inputEvents, applyCoupon, submitError }">
-            <form class="text-sm" @submit.prevent="applyCoupon">
-                <div class="flex w-full flex-row gap-x-3">
-                    <x-rapidez-ct::input
+        <div v-if="isOpen" v-cloak class="text-sm">
+            <graphql-mutation
+                :query="'mutation ($cart_id: String!, $coupon_code: String!) { applyCouponToCart(input: { cart_id: $cart_id, coupon_code: $coupon_code }) { cart { ' + config.queries.cart + ' } } }'"
+                :variables="{ cart_id: mask, coupon_code: '' }"
+                :notify="{ message: config.translations.cart.coupon.applied }"
+                :clear="true"
+                :watch="false"
+                :callback="updateCart"
+                :error-callback="checkResponseForExpiredCart"
+                v-slot="{ mutate, variables }"
+            >
+                <form v-on:submit.prevent="mutate" class="flex w-full gap-x-3">
+                    <x-rapidez::input
+                        :label="false"
                         class="text-ct-primary w-60"
                         name="couponCode"
-                        :placeholder="__('Enter code') . '...'"
-                        v-on="inputEvents"
-                        v-bind:value="couponCode"
+                        placeholder="Coupon code"
+                        v-model="variables.coupon_code"
                         v-bind:disabled="$root.loading"
                         required
                     />
-                    <x-rapidez-ct::button.outline type="submit" loader>
+                    <x-rapidez::button type="submit" class="sm:text-sm">
                         @lang('Apply')
-                    </x-rapidez-ct::button.outline>
-                </div>
-                <div v-if="cart.discount_name && cart.discount_amount < 0" class="text-ct-inactive mt-1 flex items-center gap-x-2">
-                    <button v-on:click="removeCoupon">
-                        <x-heroicon-s-x-mark class="h-4 w-4" />
-                    </button>
-                    @lang('Discount'): @{{ cart.discount_name }}
-                </div>
-                <div v-if="submitError" class="text-ct-error mt-1 italic">
-                    @{{ submitError }}
-                </div>
-            </form>
-        </coupon>
+                    </x-rapidez::button>
+                </form>
+            </graphql-mutation>
+
+            <div class="flex w-full gap-x-3">
+                <x-rapidez-ct::input
+                    class="text-ct-primary w-60"
+                    name="couponCode"
+                    :placeholder="__('Enter code') . '...'"
+                    v-on="inputEvents"
+                    v-bind:value="couponCode"
+                    v-bind:disabled="$root.loading"
+                    required
+                />
+                <x-rapidez-ct::button.outline type="submit" loader>
+                    @lang('Apply')
+                </x-rapidez-ct::button.outline>
+            </div>
+
+            <template v-if="cart.applied_coupons?.length" v-for="coupon in cart.applied_coupons" v-cloak>
+                <graphql-mutation
+                    :query="'mutation ($cart_id: String!) { removeCouponFromCart(input: { cart_id: $cart_id }) { cart { ' + config.queries.cart + ' } } }'"
+                    :variables="{ cart_id: mask }"
+                    :callback="updateCart"
+                    :error-callback="checkResponseForExpiredCart"
+                    v-slot="{ mutate }"
+                >
+                    <form v-on:submit.prevent="mutate" class="text-ct-inactive mt-1 flex items-center gap-x-2">
+                        <button type="submit">
+                            <x-heroicon-s-x-mark class="size-4 text-black-400"/>
+                        </button>
+                        @{{ coupon.code }}
+                    </form>
+                </graphql-mutation>
+            </template>
+        </div>
         <x-rapidez-ct::button.outline v-show="!isOpen" @click="toggle">
             @lang('Coupon code')
         </x-rapidez-ct::button.outline>

diff --git a/resources/views/cart/overview.blade.php b/resources/views/cart/overview.blade.php
@@ -5,21 +5,26 @@
 @section('robots', 'NOINDEX,NOFOLLOW')
 
 @section('content')
-    <cart v-cloak>
-        <div v-if="hasItems" class="container" slot-scope="{ cart, hasItems, changeQty, remove }">
-            <x-rapidez-ct::layout class="!mt-0">
-                @include('rapidez-ct::cart.cart')
-                <x-slot:sidebar>
-                    @include('rapidez-ct::cart.partials.sidebar.sidebar')
-                </x-slot:sidebar>
-            </x-rapidez-ct::layout>
-            @include('rapidez-ct::cart.partials.crosssells')
-        </div>
-        <div v-else class="container">
-            <p>@lang("You don't have anything in your cart.")</p>
-            <x-rapidez-ct::button.outline class="mt-3" href="/">
-                @lang('Return to home')
-            </x-rapidez-ct::button.outline>
-        </div>
-    </cart>
+    <graphql v-if="mask"
+        :query="'query getCart($cart_id: String!) { cart (cart_id: $cart_id) { ' + config.queries.cart + ' } }'"
+        :variables="{ cart_id: mask }" 
+        :callback="updateCart" 
+        :error-callback="checkResponseForExpiredCart"
+    >
+    </graphql>
+    <div v-if="hasCart" v-cloak class="container">
+        <x-rapidez-ct::layout class="!mt-0">
+            @include('rapidez-ct::cart.cart')
+            <x-slot:sidebar>
+                @include('rapidez-ct::cart.partials.sidebar.sidebar')
+            </x-slot:sidebar>
+        </x-rapidez-ct::layout>
+        @include('rapidez-ct::cart.partials.crosssells')
+    </div>
+    <div v-else class="container">
+        <p>@lang("You don't have anything in your cart.")</p>
+        <x-rapidez-ct::button.outline class="mt-3" href="/">
+            @lang('Return to home')
+        </x-rapidez-ct::button.outline>
+    </div>
 @endsection
diff --git a/resources/views/cart/partials/product/description.blade.php b/resources/views/cart/partials/product/description.blade.php
@@ -1,14 +1,19 @@
 <td class="flex max-md:w-1/2 md:table-cell">
     <div class="flex flex-col items-start">
-        <a :href="item.url | url">
-            <div dusk="cart-item-name">@{{ item.name }}</div>
-            <div v-for="(optionValue, option) in item.options">
-                @{{ option }}: @{{ optionValue }}
+        <a :href="item.product.url_key + item.product.url_suffix | url">
+            <div dusk="cart-item-name">@{{ item.product.name }}</div>
+            <div v-for="option in item.configurable_options">
+                @{{ option.option_label }}: @{{ option.value_label }}
             </div>
-            <div v-for="option in cart?.items2?.find((item) => item.item_id == itemId).options.filter((option) => !['info_buyRequest', 'option_ids'].includes(option.code) && option.label)">
-                @{{ option.label }}: @{{ option.value.title || option.value }}
+            <div v-for="option in item.customizable_options">
+                @{{ option.label }}: @{{ option.values[0].label || option.values[0].value }}
+            </div>
+            <div v-for="option in config.cart_attributes">
+                <template v-if="item.product.attribute_values?.[option] && typeof item.product.attribute_values[option] === 'object'">
+                    @{{ option }}: <span v-html="item.product.attribute_values[option]?.join(', ')"></span>
+                </template>
             </div>
         </a>
         @include('rapidez-ct::cart.partials.product.remove-button')
     </div>
-</td>
+</td>
diff --git a/resources/views/cart/partials/product/image.blade.php b/resources/views/cart/partials/product/image.blade.php
@@ -1,4 +1,5 @@
 <td class="h-24 w-40 !pl-0 max-md:flex max-md:w-1/2">
-    <img v-if="item.image" class="object-contain" :alt="item.name" :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + item.image + '.webp'">
+    <img v-if="item.image" class="object-contain" :alt="item.product.name" :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + item.product.image.url.replace(config.media_url, '') + '.webp'">
     <x-rapidez::no-image v-else />
 </td>
+
diff --git a/resources/views/cart/partials/product/price.blade.php b/resources/views/cart/partials/product/price.blade.php
@@ -1,14 +1,14 @@
 <td class="flex items-center font-medium max-md:w-1/3 md:table-cell">
-    <div v-if="item.specialPrice">
-        @{{ item.specialPrice | price }}
+    <div v-if="item.prices.specialPrice">
+        @{{ item.prices.specialPrice | price }}
     </div>
-    <div :class="{ 'line-through text-xs text-ct-inactive font-normal': item.specialPrice }">
-        @{{ item.price | price }}
+    <div :class="{ 'line-through text-xs text-ct-inactive font-normal': item.prices.specialPrice }">
+        @{{ item.prices.price_including_tax.value | price }}
     </div>
 </td>
-<td class="flex items-center font-medium max-md:w-1/3 md:table-cell [&>*]:mx-auto">
+<td class="flex items-center font-medium max-md:w-1/3 md:table-cell *:mx-auto">
     <x-rapidez-ct::input.quantity/>
 </td>
 <td class="flex items-center justify-end text-right font-medium max-md:w-1/3 md:table-cell">
-    @{{ item.total | price }}
-</td>
+    @{{ item.prices.row_total_including_tax.value | price }}
+</td>
diff --git a/resources/views/cart/partials/products.blade.php b/resources/views/cart/partials/products.blade.php
@@ -1,6 +1,6 @@
 <table class="w-full border-b">
     <thead class="bg-ct-inactive-100 mt-5 flex rounded md:table-header-group">
-        <tr class="text-xs [&>*]:py-4 [&>*]:font-normal [&>*]:px-5">
+        <tr class="text-xs *:py-4 *:font-normal *:px-5">
             <th class="!pl-0 max-md:hidden"></th>
             <th class="text-start">@lang('Product')</th>
             <th class="text-start max-md:hidden">@lang('Price')</th>
@@ -9,7 +9,7 @@
         </tr>
     </thead>
     <tbody class="divide-y">
-        <tr v-for="(item, itemId, index) in cart.items" class="flex flex-wrap gap-y-5 py-5 md:table-row md:[&>*]:p-5">
+        <tr v-for="(item, index) in cart.items" v-if="cart.items" class="flex flex-wrap gap-y-5 py-5 md:table-row md:*:p-5">
             @include('rapidez-ct::cart.partials.product.image')
             @include('rapidez-ct::cart.partials.product.description')
             @include('rapidez-ct::cart.partials.product.price')

diff --git a/resources/views/cart/partials/sidebar/summary.blade.php b/resources/views/cart/partials/sidebar/summary.blade.php
@@ -5,28 +5,28 @@
     <x-rapidez-ct::separated-listing tag="dl">
         <div>
             <dt>@lang('Subtotal')</dt>
-            <dd>@{{ cart.subtotal | price }}</dd>
+            <dd>@{{ cart.prices.subtotal_including_tax.value | price }}</dd>
         </div>
         <div v-if="cart.shipping_method">
             <dt>@lang('Shipping')</dt>
-            <dd v-if="cart.shipping_amount_excl_tax > 0">
-                @{{ cart.shipping_amount_excl_tax | price }}
+            <dd v-if="cart.shipping_addresses[0].selected_shipping_method.amount.value  > 0">
+                @{{ cart.shipping_addresses[0].selected_shipping_method.amount.value | price  }}
             </dd>
             <dd v-else class="font-medium text-ct-enhanced">
                 @lang('Free')
             </dd>
         </div>
         <div v-if="cart.tax > 0">
             <dt>@lang('Tax')</dt>
-            <dd>@{{ cart.tax | price }}</dd>
+            <dd>@{{ cart.prices.applied_taxes[0].amount.value | price }}</dd>
         </div>
-        <div v-if="cart.discount_name">
-            <dt>@lang('Discount') (@{{ cart.discount_name }})</dt>
-            <dd>@{{ cart.discount_amount | price }}</dd>
+        <div v-for="discount in cart.prices.discounts">
+            <dt>@{{ discount.label }}</dt>
+            <dd>-@{{ discount.amount.value | price }}</dd>
         </div>
         <div class="font-medium">
             <dt>@lang('Total')</dt>
-            <dd>@{{ cart.total | price }}</dd>
+            <dd>@{{ cart.prices.grand_total.value | price }}</dd>
         </div>
     </x-rapidez-ct::separated-listing>
 

diff --git a/resources/views/checkout/overview.blade.php b/resources/views/checkout/overview.blade.php
@@ -5,7 +5,7 @@
 @section('robots', 'NOINDEX,NOFOLLOW')
 
 @section('content')
-    <checkout v-slot="{ checkout, cart, hasItems, save, goToStep }" :set="checkout.step = Math.max(checkout.step, 2)" v-cloak>
+    <checkout v-slot="{ checkout, save, goToStep, forceAccount }" :set="checkout.step = Math.max(checkout.step, 2)" v-cloak>
         <div class="container">
             @include('rapidez-ct::checkout.partials.layout')
         </div>

diff --git a/resources/views/checkout/partials/sections/success/newsletter.blade.php b/resources/views/checkout/partials/sections/success/newsletter.blade.php
@@ -0,0 +1,8 @@
+<template v-if="$root.loggedIn">
+    <x-rapidez-ct::newsletter/>
+</template>
+@if (Rapidez::config('newsletter/subscription/allow_guest_subscribe', 1))
+    <template v-else>
+        <x-rapidez-ct::newsletter.input email="$root.guestEmail" />
+    </template>
+@endif
diff --git a/resources/views/checkout/partials/sidebar/summary.blade.php b/resources/views/checkout/partials/sidebar/summary.blade.php
@@ -7,7 +7,7 @@
     </x-rapidez-ct::title.lg>
     <x-rapidez-ct::separated-listing class="border-b pb-4 mb-4">
         <li v-for="item in cart.items">
-            @{{ item.qty }}x @{{ item.name }}
+            @{{ item.quantity }}x @{{ item.product.name }}
         </li>
     </x-rapidez-ct::separated-listing>
     <x-rapidez-ct::separated-listing tag="dl">

diff --git a/resources/views/checkout/steps/success.blade.php b/resources/views/checkout/steps/success.blade.php
@@ -9,6 +9,7 @@
         <x-rapidez-ct::sections>
             @include('rapidez-ct::checkout.partials.sections.success.order-info')
             @include('rapidez-ct::checkout.partials.sections.success.products')
+            @include('rapidez-ct::checkout.partials.sections.success.newsletter')
             @includeWhen(
                 config('rapidez.checkout-theme.checkout.success.register'),
                 'rapidez-ct::checkout.partials.sections.success.create-account'