Merge branch 'main' into mobile_payment

.github/workflows/compliance.yml

@@ -23,3 +23,15 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH: ${{ github.head_ref }}
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v4
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v4
+        with:
+          license-check: true
+          deny-licenses: 'AGPL-1.0-or-later, GPL-1.0-or-later, LGPL-2.0-or-later, NGPL'
+          vulnerability-check: false
+          comment-summary-in-pr: on-failure

apps/server/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "display": "Server",
   "compilerOptions": {
+    "resolveJsonModule": true,
     "lib": ["DOM", "DOM.Iterable", "ES2019"],
     "composite": false,
     "declaration": false,

apps/web/components/AddressForm/AddressForm.vue

@@ -98,20 +98,29 @@
 </template>
 
 <script setup lang="ts">
-import { type Address, AddressType, userAddressGetters } from '@plentymarkets/shop-api';
+import {
+  type ActiveShippingCountry,
+  type Address,
+  AddressType,
+  type GeoRegulatedCountry,
+  userAddressGetters,
+} from '@plentymarkets/shop-api';
 import { SfCheckbox, SfInput, SfLoaderCircular, SfSelect } from '@storefront-ui/vue';
-import type { AddressFormProps } from '~/components/AddressForm/types';
+import { type AddressFormProps } from '~/components/AddressForm/types';
+
+const { type, savedAddress: propertySavedAddress, useAsShippingDefault = true } = defineProps<AddressFormProps>();
 
 const { loading: loadBilling } = useAddress(AddressType.Billing);
 const { loading: loadShipping } = useAddress(AddressType.Shipping);
-
 const {
-  type,
-  savedAddress: propertySavedAddress,
-  countries,
-  useAsShippingDefault = true,
-} = defineProps<AddressFormProps>();
+  useGeoRegulatedCountries,
+  default: defaultCountries,
+  geoRegulated: geoRegulatedCountries,
+} = useAggregatedCountries();
 
+const countries = computed(() =>
+  type === AddressType.Billing && useGeoRegulatedCountries ? geoRegulatedCountries.value : defaultCountries.value,
+);
 const isCartUpdateLoading = computed(() => loadBilling.value || loadShipping.value);
 const useAsShippingAddress = ref(useAsShippingDefault);
 const savedAddress = propertySavedAddress || ({} as Address);
@@ -146,7 +155,11 @@ const clearInputs = () => {
 
 const states = computed(() => {
   const selectedCountry = defaultValues.value.country;
-  return countries.find((country) => country.id === Number(selectedCountry))?.states ?? [];
+  return (
+    countries.value.find(
+      (country: ActiveShippingCountry | GeoRegulatedCountry) => country.id === Number(selectedCountry),
+    )?.states ?? []
+  );
 });
 
 defineEmits(['on-save', 'on-close']);

apps/web/components/AddressForm/types.ts

@@ -1,8 +1,7 @@
-import type { Address, ActiveShippingCountry, AddressType } from '@plentymarkets/shop-api';
+import { type Address, AddressType } from '@plentymarkets/shop-api';
 
 export type AddressFormProps = {
   type: AddressType;
   savedAddress?: Address;
-  countries: ActiveShippingCountry[];
   useAsShippingDefault?: boolean;
 };

apps/web/components/AddressFormBilling/AddressFormBilling.vue

@@ -119,11 +119,11 @@
         :invalid="Boolean(errors['country'])"
       >
         <option
-          v-for="(shippingCountry, index) in countries"
+          v-for="(billingCountry, index) in countries"
           :key="`billing-country-${index}`"
-          :value="shippingCountry.id.toString()"
+          :value="billingCountry.id.toString()"
         >
-          {{ shippingCountry.currLangName }}
+          {{ billingCountry.currLangName }}
         </option>
       </SfSelect>
       <ErrorMessage as="span" name="country" class="flex text-negative-700 text-sm mt-2" />
@@ -139,12 +139,17 @@ import { type Address, AddressType, userAddressGetters } from '@plentymarkets/sh
 
 const { address, addAddress = false } = defineProps<AddressFormProps>();
 
-const { data: countries } = useActiveShippingCountries();
 const { hasCompany, addressToSave, save: saveAddress, validationSchema } = useAddressForm(AddressType.Billing);
 const { addresses: billingAddresses } = useAddressStore(AddressType.Billing);
 const { set: setCheckoutAddress } = useCheckoutAddress(AddressType.Billing);
-
 const { defineField, errors, setValues, validate, handleSubmit } = useForm({ validationSchema: validationSchema });
+const {
+  useGeoRegulatedCountries,
+  default: defaultCountries,
+  geoRegulated: geoRegulatedCountries,
+} = useAggregatedCountries();
+
+const countries = computed(() => (useGeoRegulatedCountries ? geoRegulatedCountries.value : defaultCountries.value));
 
 const [firstName, firstNameAttributes] = defineField('firstName');
 const [lastName, lastNameAttributes] = defineField('lastName');

apps/web/components/AddressFormShipping/AddressFormShipping.vue

@@ -121,7 +121,7 @@
         :invalid="Boolean(errors['country'])"
       >
         <option
-          v-for="(shippingCountry, index) in countries"
+          v-for="(shippingCountry, index) in defaultCountries"
           :key="`shipping-country-${index}`"
           :value="shippingCountry.id.toString()"
         >
@@ -147,7 +147,7 @@ import { type Address, AddressType, userAddressGetters } from '@plentymarkets/sh
 const { address, addAddress = false } = defineProps<AddressFormProps>();
 
 const { isGuest } = useCustomer();
-const { data: countries } = useActiveShippingCountries();
+const { default: defaultCountries } = useAggregatedCountries();
 const { shippingAsBilling } = useShippingAsBilling();
 const { addresses: shippingAddresses } = useAddressStore(AddressType.Shipping);
 const { addresses: billingAddresses } = useAddressStore(AddressType.Billing);
@@ -161,7 +161,6 @@ const {
   validationSchema: shippingSchema,
   refreshAddressDependencies,
 } = useAddressForm(AddressType.Shipping);
-
 const { defineField, errors, setValues, validate, handleSubmit } = useForm({ validationSchema: shippingSchema });
 
 const [firstName, firstNameAttributes] = defineField('firstName');

apps/web/components/AddressesList/AddressesList.vue

@@ -46,7 +46,6 @@
         </h3>
       </header>
       <AddressForm
-        :countries="activeShippingCountries"
         :saved-address="selectedAddress"
         :use-as-shipping-default="false"
         :type="type"
@@ -65,7 +64,6 @@ import { type AddressesListProps } from './types';
 const { type, editAddressText, addAddressText } = defineProps<AddressesListProps>();
 
 const { isOpen, open, close } = useDisclosure();
-const { data: activeShippingCountries, getActiveShippingCountries } = useActiveShippingCountries();
 const { saveAddress: saveShippingAddress } = useAddress(AddressType.Shipping);
 const {
   data: addresses,
@@ -77,7 +75,7 @@ const {
   loading,
 } = useAddress(type);
 
-await getActiveShippingCountries();
+await useAggregatedCountries().fetchAggregatedCountries();
 await getAddresses();
 
 const selectedAddress = ref();

apps/web/components/ManufacturerResponsibleInfo/ManufacturerResponsibleInfo.vue

@@ -18,8 +18,9 @@
         "
       >
         {{ manufacturerResponsibleInfo.postCode }}
-        <span v-if="manufacturerResponsibleInfo.town"> {{ manufacturerResponsibleInfo.town }},&nbsp;</span>
-        {{ manufacturerResponsibleInfo.country }}
+        <span v-if="manufacturerResponsibleInfo.town"> {{ manufacturerResponsibleInfo.town }}</span>
+        <span v-if="manufacturerResponsibleInfo.town && manufacturerResponsibleInfo.country">, &nbsp;</span>
+        <span v-if="manufacturerResponsibleInfo.country">{{ manufacturerResponsibleInfo.country }}</span>
       </p>
       <p v-if="manufacturerResponsibleInfo.phoneNo">{{ t('phone') }}: {{ manufacturerResponsibleInfo.phoneNo }}</p>
       <p v-if="manufacturerResponsibleInfo.email">{{ t('email') }}: {{ manufacturerResponsibleInfo.email }}</p>