Merge pull request #959 from evershopcommerce/fix_934

fix: Billing country missing or restricted for virtual products #934

Author: treoden

packages/evershop/src/components/frontStore/checkout/payment/BillingAddress.tsx

@@ -137,6 +137,7 @@ export function BillingAddress({
                           <CustomerAddressForm
                             areaId="checkoutBillingAddressForm"
                             fieldNamePrefix="billingAddress"
+                            countryScope="all"
                             address={undefined} // Always start empty for different address
                           />
                           {noShippingRequired && (
@@ -160,6 +161,7 @@ export function BillingAddress({
                   <CustomerAddressForm
                     areaId="checkoutBillingAddressForm"
                     fieldNamePrefix="billingAddress"
+                    countryScope="all"
                     address={undefined} // Always start empty for different address
                   />
                   {noShippingRequired && (

packages/evershop/src/components/frontStore/customer/MyAddresses.tsx

@@ -58,11 +58,17 @@ const Address: React.FC<{
                     setDialogOpen(false);
                     toast.success(_('Address has been updated successfully!'));
                   } catch (error) {
-                    toast.error(error.message);
+                    toast.error(
+                      error instanceof Error ? error.message : String(error)
+                    );
                   }
                 }}
               >
-                <CustomerAddressForm address={address} fieldNamePrefix="" />
+                <CustomerAddressForm
+                  address={address}
+                  fieldNamePrefix=""
+                  countryScope="all"
+                />
                 <div className="mt-3">
                   <CheckboxField
                     label={_('Set as default')}
@@ -82,7 +88,9 @@ const Address: React.FC<{
                     await deleteAddress(address.uuid as string);
                     toast.success(_('Address has been deleted successfully!'));
                   } catch (error) {
-                    toast.error(error.message);
+                    toast.error(
+                      error instanceof Error ? error.message : String(error)
+                    );
                   }
                 }}
               >
@@ -144,11 +152,17 @@ export function MyAddresses({ title }: { title?: string }) {
                 setDialogOpen(false);
                 toast.success(_('Address has been saved successfully!'));
               } catch (error) {
-                toast.error(error.message);
+                toast.error(
+                  error instanceof Error ? error.message : String(error)
+                );
               }
             }}
           >
-            <CustomerAddressForm address={undefined} fieldNamePrefix="" />
+            <CustomerAddressForm
+              address={undefined}
+              fieldNamePrefix=""
+              countryScope="all"
+            />
             <div className="mt-3">
               <CheckboxField
                 label={_('Set as default')}

packages/evershop/src/components/frontStore/customer/address/addressForm/Index.tsx

@@ -4,7 +4,7 @@ import { CustomerAddressGraphql } from '@evershop/evershop/types/customerAddress
 import React from 'react';
 import { useQuery } from 'urql';
 
-const CountriesQuery = `
+const AllowedCountriesQuery = `
   query Country {
     allowedCountries  {
       value: code
@@ -17,19 +17,34 @@ const CountriesQuery = `
   }
 `;
 
+const AllCountriesQuery = `
+  query Country {
+    countries {
+      value: code
+      label: name
+      provinces {
+        label: name
+        value: code
+      }
+    }
+  }
+`;
+
 interface IndexProps {
   address?: CustomerAddressGraphql;
   areaId?: string;
   fieldNamePrefix?: string;
+  countryScope?: 'allowed' | 'all';
 }
 
 export default function Index({
   address = {},
   areaId = 'customerAddressForm',
-  fieldNamePrefix = 'address'
+  fieldNamePrefix = 'address',
+  countryScope = 'allowed'
 }: IndexProps) {
   const [result] = useQuery({
-    query: CountriesQuery
+    query: countryScope === 'all' ? AllCountriesQuery : AllowedCountriesQuery
   });
 
   const { data, fetching, error } = result;
@@ -39,11 +54,16 @@ export default function Index({
     return <p className="text-destructive">{error.message}</p>;
   }
 
+  const countries =
+    countryScope === 'all'
+      ? data?.countries || []
+      : data?.allowedCountries || [];
+
   return (
     <CustomerAddressForm
       address={address}
       areaId={areaId}
-      allowCountries={data.allowedCountries}
+      allowCountries={countries}
       fieldNamePrefix={fieldNamePrefix}
     />
   );