@akinon/projectzero 1.108.0-rc.4 → 1.108.0-rc.6

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.108.0-rc.6
+
+## 1.108.0-rc.5
+
 ## 1.108.0-rc.4
 
 ## 1.108.0-rc.3

package/app-template/CHANGELOG.md

@@ -1,5 +1,65 @@
 # projectzeronext
 
+## 1.108.0-rc.6
+
+### Minor Changes
+
+- 4449f3a3: ZERO-3681: Add order details localization and improve order handling in AccountOrderDetail
+- b87517ff: ZERO-3680: Enhance select component styling to ensure focus state is consistent
+
+### Patch Changes
+
+- @akinon/next@1.108.0-rc.6
+- @akinon/pz-akifast@1.108.0-rc.6
+- @akinon/pz-apple-pay@1.108.0-rc.6
+- @akinon/pz-b2b@1.108.0-rc.6
+- @akinon/pz-basket-gift-pack@1.108.0-rc.6
+- @akinon/pz-bkm@1.108.0-rc.6
+- @akinon/pz-checkout-gift-pack@1.108.0-rc.6
+- @akinon/pz-click-collect@1.108.0-rc.6
+- @akinon/pz-credit-payment@1.108.0-rc.6
+- @akinon/pz-cybersource-uc@1.108.0-rc.6
+- @akinon/pz-flow-payment@1.108.0-rc.6
+- @akinon/pz-gpay@1.108.0-rc.6
+- @akinon/pz-hepsipay@1.108.0-rc.6
+- @akinon/pz-masterpass@1.108.0-rc.6
+- @akinon/pz-multi-basket@1.108.0-rc.6
+- @akinon/pz-one-click-checkout@1.108.0-rc.6
+- @akinon/pz-otp@1.108.0-rc.6
+- @akinon/pz-pay-on-delivery@1.108.0-rc.6
+- @akinon/pz-saved-card@1.108.0-rc.6
+- @akinon/pz-tabby-extension@1.108.0-rc.6
+- @akinon/pz-tamara-extension@1.108.0-rc.6
+- @akinon/pz-virtual-try-on@1.108.0-rc.6
+
+## 1.108.0-rc.5
+
+### Patch Changes
+
+- Updated dependencies [31a2d35]
+  - @akinon/pz-flow-payment@1.108.0-rc.5
+  - @akinon/pz-apple-pay@1.108.0-rc.5
+  - @akinon/next@1.108.0-rc.5
+  - @akinon/pz-hepsipay@1.108.0-rc.5
+  - @akinon/pz-virtual-try-on@1.108.0-rc.5
+  - @akinon/pz-akifast@1.108.0-rc.5
+  - @akinon/pz-b2b@1.108.0-rc.5
+  - @akinon/pz-basket-gift-pack@1.108.0-rc.5
+  - @akinon/pz-bkm@1.108.0-rc.5
+  - @akinon/pz-checkout-gift-pack@1.108.0-rc.5
+  - @akinon/pz-click-collect@1.108.0-rc.5
+  - @akinon/pz-credit-payment@1.108.0-rc.5
+  - @akinon/pz-cybersource-uc@1.108.0-rc.5
+  - @akinon/pz-gpay@1.108.0-rc.5
+  - @akinon/pz-masterpass@1.108.0-rc.5
+  - @akinon/pz-multi-basket@1.108.0-rc.5
+  - @akinon/pz-one-click-checkout@1.108.0-rc.5
+  - @akinon/pz-otp@1.108.0-rc.5
+  - @akinon/pz-pay-on-delivery@1.108.0-rc.5
+  - @akinon/pz-saved-card@1.108.0-rc.5
+  - @akinon/pz-tabby-extension@1.108.0-rc.5
+  - @akinon/pz-tamara-extension@1.108.0-rc.5
+
 ## 1.108.0-rc.4
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.108.0-rc.4",
+  "version": "1.108.0-rc.6",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,28 +24,28 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.108.0-rc.4",
-    "@akinon/pz-akifast": "1.108.0-rc.4",
-    "@akinon/pz-apple-pay": "1.108.0-rc.4",
-    "@akinon/pz-b2b": "1.108.0-rc.4",
-    "@akinon/pz-basket-gift-pack": "1.108.0-rc.4",
-    "@akinon/pz-bkm": "1.108.0-rc.4",
-    "@akinon/pz-checkout-gift-pack": "1.108.0-rc.4",
-    "@akinon/pz-click-collect": "1.108.0-rc.4",
-    "@akinon/pz-credit-payment": "1.108.0-rc.4",
-    "@akinon/pz-cybersource-uc": "1.108.0-rc.4",
-    "@akinon/pz-flow-payment": "1.108.0-rc.4",
-    "@akinon/pz-gpay": "1.108.0-rc.4",
-    "@akinon/pz-hepsipay": "1.108.0-rc.4",
-    "@akinon/pz-masterpass": "1.108.0-rc.4",
-    "@akinon/pz-multi-basket": "1.108.0-rc.4",
-    "@akinon/pz-one-click-checkout": "1.108.0-rc.4",
-    "@akinon/pz-otp": "1.108.0-rc.4",
-    "@akinon/pz-pay-on-delivery": "1.108.0-rc.4",
-    "@akinon/pz-saved-card": "1.108.0-rc.4",
-    "@akinon/pz-tabby-extension": "1.108.0-rc.4",
-    "@akinon/pz-tamara-extension": "1.108.0-rc.4",
-    "@akinon/pz-virtual-try-on": "1.108.0-rc.4",
+    "@akinon/next": "1.108.0-rc.6",
+    "@akinon/pz-akifast": "1.108.0-rc.6",
+    "@akinon/pz-apple-pay": "1.108.0-rc.6",
+    "@akinon/pz-b2b": "1.108.0-rc.6",
+    "@akinon/pz-basket-gift-pack": "1.108.0-rc.6",
+    "@akinon/pz-bkm": "1.108.0-rc.6",
+    "@akinon/pz-checkout-gift-pack": "1.108.0-rc.6",
+    "@akinon/pz-click-collect": "1.108.0-rc.6",
+    "@akinon/pz-credit-payment": "1.108.0-rc.6",
+    "@akinon/pz-cybersource-uc": "1.108.0-rc.6",
+    "@akinon/pz-flow-payment": "1.108.0-rc.6",
+    "@akinon/pz-gpay": "1.108.0-rc.6",
+    "@akinon/pz-hepsipay": "1.108.0-rc.6",
+    "@akinon/pz-masterpass": "1.108.0-rc.6",
+    "@akinon/pz-multi-basket": "1.108.0-rc.6",
+    "@akinon/pz-one-click-checkout": "1.108.0-rc.6",
+    "@akinon/pz-otp": "1.108.0-rc.6",
+    "@akinon/pz-pay-on-delivery": "1.108.0-rc.6",
+    "@akinon/pz-saved-card": "1.108.0-rc.6",
+    "@akinon/pz-tabby-extension": "1.108.0-rc.6",
+    "@akinon/pz-tamara-extension": "1.108.0-rc.6",
+    "@akinon/pz-virtual-try-on": "1.108.0-rc.6",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -68,7 +68,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.108.0-rc.4",
+    "@akinon/eslint-plugin-projectzero": "1.108.0-rc.6",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/public/locales/en/account.json

@@ -242,7 +242,9 @@
       "total": "Total",
       "items": "items",
       "packages": "Packages",
-      "package_no": "Package no"
+      "package_no": "Package no",
+      "back_to_orders": "Back to Orders",
+      "no_orders_found": "No orders found"
     },
     "return": {
       "title": "Return Items",

package/app-template/public/locales/tr/account.json

@@ -242,7 +242,9 @@
       "total": "Toplam",
       "items": "adet",
       "packages": "paket",
-      "package_no": "Paket no"
+      "package_no": "Paket no",
+      "back_to_orders": "Siparişlere geri dön",
+      "no_orders_found": "Sipariş bulunamadı"
     },
     "return": {
       "title": "İade Ürünleri",

package/app-template/src/app/[commerce]/[locale]/[currency]/account/orders/[id]/page.tsx

@@ -61,7 +61,26 @@ const AccountOrderDetail = ({ params: { id } }) => {
   }, [order, isSuccess, localeValue]);
 
   if (isLoading && isFetching) {
-    return <LoaderSpinner />;
+    return (
+      <div className="flex flex-col items-center justify-center h-96">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  if (!order) {
+    return (
+      <div className="flex flex-col items-center justify-center h-96">
+        <p className="mt-5 text-start text-lg mb-4">
+          {t('account.my_orders.detail.no_orders_found')}
+        </p>
+        <Link href={`/account/orders/`}>
+          <Button className="px-4" appearance="filled">
+            {t('account.my_orders.detail.back_to_orders')}
+          </Button>
+        </Link>
+      </div>
+    );
   }
 
   return (

package/app-template/src/components/modal.tsx

@@ -41,12 +41,14 @@ export const Modal = (props: ModalProps) => {
           'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
           overlayClassName
         )}
+        onClick={(e) => e.stopPropagation()}
       />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
           className
         )}
+        onClick={(e) => e.stopPropagation()}
       >
         {(showCloseButton || title) && (
           <div

package/app-template/src/components/select.tsx

@@ -48,7 +48,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
             clsx(
               'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
               !borderless &&
-                'border border-gray-200 transition-all duration-150 hover:border-primary',
+                'border border-gray-200 transition-all duration-150 hover:border-primary focus:border-primary',
               'appearance-none bg-transparent'
             ),
             className

package/app-template/src/views/account/orders/order-detail-header.tsx

@@ -21,7 +21,7 @@ export const OrderDetailHeader = ({ title, order, children }: Props) => {
         <div>
           <span>{t('account.my_orders.detail.order_number')}</span>:{' '}
           <span data-testid="account-orders-return-order-id">
-            {order.number}
+            {order?.number}
           </span>
         </div>
 

package/app-template/src/views/checkout/steps/shipping/address-box.tsx

@@ -85,7 +85,7 @@ const AddressBox = ({
   };
 
   const onSubmit = (data) => {
-    editAddress({ ...data, invalidateTag: 'Addresses' })
+    editAddress({ ...data, invalidateTag: 'Checkout' })
       .unwrap()
       .then((editAddressResponse) => {
         handleAddressClick(addressType, editAddressResponse);
@@ -96,7 +96,7 @@ const AddressBox = ({
   };
 
   const handleRemoveAddress = async (addressPk: number) => {
-    await removeAddress({ id: addressPk, invalidateTag: 'Addresses' });
+    await removeAddress({ id: addressPk, invalidateTag: 'Checkout' });
     setRemoveAddressModalOpen(false);
     dispatch(resetCheckoutState());
 
@@ -168,7 +168,10 @@ const AddressBox = ({
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={() => setIsEditAddressModalOpen(true)}
+          onClick={(e) => {
+            e.stopPropagation();
+            setIsEditAddressModalOpen(true);
+          }}
           data-testid="checkout-address-edit"
         >
           {t('checkout.address.box.edit')}
@@ -180,21 +183,26 @@ const AddressBox = ({
           setOpen={setIsEditAddressModalOpen}
           className="w-full sm:w-[28rem] max-h-[90vh] overflow-y-auto"
         >
-          <AddressForm
-            data={{
-              ...address,
-              country: address.country?.pk,
-              city: address.city?.pk,
-              township: address.township?.pk,
-              district: address.district?.pk
-            }}
-            onSubmit={onSubmit}
-          />
+          <div onClick={(e) => e.stopPropagation()}>
+            <AddressForm
+              data={{
+                ...address,
+                country: address.country?.pk,
+                city: address.city?.pk,
+                township: address.township?.pk,
+                district: address.district?.pk
+              }}
+              onSubmit={onSubmit}
+            />
+          </div>
         </Modal>
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={() => setRemoveAddressModalOpen(true)}
+          onClick={(e) => {
+            e.stopPropagation();
+            setRemoveAddressModalOpen(true);
+          }}
           data-testid="checkout-address-remove"
         >
           {t('checkout.address.box.remove')}
@@ -207,14 +215,18 @@ const AddressBox = ({
         setOpen={setRemoveAddressModalOpen}
         showCloseButton={false}
       >
-        <div className="text-center px-6 py-10">
+        <div
+          className="text-center px-6 py-10"
+          onClick={(e) => e.stopPropagation()}
+        >
           <p className="mb-4">
             {t('account.address_book.modal.delete_description')}
           </p>
           <div className="space-x-3 flex justify-center">
             <Button
               appearance="outlined"
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                 setRemoveAddressModalOpen(false);
               }}
               data-testid="remove-address-modal-cancel"
@@ -224,7 +236,8 @@ const AddressBox = ({
             <Button
               appearance="filled"
               disabled={removeAddressLoading}
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                 handleRemoveAddress(address.pk);
               }}
               className={

package/app-template/src/views/checkout/steps/shipping/addresses.tsx

@@ -77,7 +77,7 @@ const Addresses = () => {
   }, [billing_and_shipping_same]);
 
   const onSubmit = (data) => {
-    addAddress({ ...data, invalidateTag: 'Addresses' })
+    addAddress({ ...data, invalidateTag: 'Checkout' })
       .unwrap()
       .then((addAddressResponse) => {
         if (addressList.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.108.0-rc.4",
+  "version": "1.108.0-rc.6",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {