Dear {$FIRSTNAME} {$LASTNAME},
\r\n{/loop}\r\nThank you for your order on our online store {config key="store_name"}.
\r\nYour order {$order_ref} dated {format_date date=$order_date} has been shipped on {format_date date=$update_date}.\r\nThe tracking number for this delivery is {$package}. Please check the FedEx website for tracking your parcel: www.coliposte.net.
\r\nFeel free to contact us for any further information
\r\nBest Regards.
'), -(@max, 'fr_FR', 'Message d''expédition de FedEx', 'Suivi FedEx commande : {$order_ref}', '{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}\r\n{$LASTNAME} {$FIRSTNAME},\r\n{/loop}\r\nNous vous remercions de votre commande sur notre site {config key="store_name"}\r\nUn colis concernant votre commande {$order_ref} du {format_date date=$order_date} a quitté nos entrepôts pour être pris en charge par FedEx le {format_date date=$update_date}.\r\nSon numéro de suivi est le suivant : {$package}\r\nIl vous permet de suivre votre colis en ligne sur le site de FedEx : www.fedex.com\r\nNous restons à votre disposition pour toute information complémentaire.\r\nCordialement', '{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}\r\n{$LASTNAME} {$FIRSTNAME},\r\n{/loop}\r\nNous vous remercions de votre commande sur notre site {config key="store_name"}\r\nUn colis concernant votre commande {$order_ref} du {format_date date=$order_date} a quitté nos entrepôts pour être pris en charge par FedEx le {format_date date=$update_date}.\r\nSon numéro de suivi est le suivant : {$package}\r\nIl vous permet de suivre votre colis en ligne sur le site de FedEx : www.fedex.com\r\nNous restons à votre disposition pour toute information complémentaire.\r\nCordialement'); +(@max, + 'en_US', + 'FedEx shipping message', + 'Your order {$order_ref} has been shipped', + '{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}Dear {$FIRSTNAME} {$LASTNAME},\r\n\r\n{/loop}Thank you for your order {$order_ref} you placed on our online store {config key="store_name"} on {format_date date=$order_date output="date"}.\r\n\r\nYour order has been shipped on {format_date date=$update_date}.\r\nPlease check the FedEx website for tracking your parcel using this link : {$tracking_url}{$package}\r\n\r\nFeel free to contact us for any further information,\r\n\r\nBest Regards.', + '{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}Dear {$FIRSTNAME} {$LASTNAME},
{/loop}\r\nThank you for your order {$order_ref} you placed on our online store {config key="store_name"} on {format_date date=$order_date output="date"}.
Your order has been shipped on {format_date date=$update_date}.Please check the FedEx website for tracking your parcel using this link : {$tracking_url}{$package}
Feel free to contact us for any further information,
Best Regards.
' + ), +(@max, + 'fr_FR', + 'Message d''expédition de FedEx', + 'Suivi FedEx commande : {$order_ref}', + '{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}\r\nCher/chère {$LASTNAME} {$FIRSTNAME},\r\n{/loop}\r\n\r\nNous vous remercions de votre commande {$order_ref} effectuée sur notre site {config key="store_name"} le {format_date date=$order_date output="date"}.\r\n\r\nVotre colis a quitté nos entrepôts pour être pris en charge par FedEx le {format_date date=$update_date output="date"}.\r\nVous pouvez le suivre en ligne sur le site officiel de FedEx via ce lien : {$tracking_url}{$package}\r\n\r\nNous restons à votre disposition pour toute information complémentaire.\r\n\r\nCordialement\r\n', + '{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}\r\nCher/chère {$LASTNAME} {$FIRSTNAME},
{/loop}\r\nNous vous remercions de votre commande {$order_ref} effectuée sur notre site {config key="store_name"} le {format_date date=$order_date output="date"}.
Votre colis a quitté nos entrepôts pour être pris en charge par FedEx le {format_date date=$update_date output="date"}.Vous pouvez le suivre en ligne sur le site officiel de FedEx via ce lien : {$tracking_url}{$package}
Nous restons à votre disposition pour toute information complémentaire.
Cordialement
' +); # This restores the fkey checks, after having unset them earlier -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; diff --git a/local/modules/FedEx/I18n/backOffice/default/en_US.php b/local/modules/FedEx/I18n/backOffice/default/en_US.php index 6a326274..04da973f 100644 --- a/local/modules/FedEx/I18n/backOffice/default/en_US.php +++ b/local/modules/FedEx/I18n/backOffice/default/en_US.php @@ -1,34 +1,23 @@ '*If you choose this option, the exported orders would not be available on this page anymore', 'Actions' => 'Actions', - 'An error occured' => 'An error occured', 'Area : ' => 'Area : ', 'Cancel' => 'Cancel', - 'FedEx Module allows to send your products all around the world with FedEx.' => 'FedEx Module allows to send your products all around the world with FedEx.', 'Create' => 'Create', 'Create a new price slice' => 'Create a new price slice', 'Create a price slice' => 'Create a price slice', - 'Date' => 'Date', 'Delete' => 'Delete', 'Delete a price slice' => 'Delete a price slice', 'Delete this price slice' => 'Delete this price slice', - 'Do not change' => 'Do not change', 'Do you really want to delete this slice ?' => 'Do you really want to delete this slice ?', 'Edit' => 'Edit', 'Edit a price slice' => 'Edit a price slice', 'Edit this price slice' => 'Edit this price slice', - 'FedEx parcel tracking URL' => 'FedEx URL for parcel tracking', + 'FedEx Module allows to send your products all around the world with FedEx.' => 'FedEx Module allows to send your products all around the world with FedEx.', 'Please change the access rights' => 'Please change the access rights', 'Price (€)' => 'Price (€)', 'Price slices' => 'Price slices', - 'Processing' => 'Processing', - 'REF' => 'REF', - 'Sent' => 'Sent', - 'This is the parcel tracking URL for FedEx.' => 'Please indicate FedEx parcel tracking`s WebService URL : last character must be symbol = ', - 'Total taxed amount' => 'Total taxed amount', + 'Save' => 'Save', 'Weight up to ... (kg)' => 'Weight up to ... (kg)', - 'Number of packages' => 'Number of packages', - 'Packages weight' => 'Packages weight' ); diff --git a/local/modules/FedEx/I18n/en_US.php b/local/modules/FedEx/I18n/en_US.php index fc14b0c2..ee49d126 100644 --- a/local/modules/FedEx/I18n/en_US.php +++ b/local/modules/FedEx/I18n/en_US.php @@ -7,5 +7,6 @@ return array( 'Can\'t write file' => 'Can\'t write file', 'FedEx delivery unavailable for the delivery country' => 'FedEx delivery unavailable for the delivery country', 'FedEx delivery unavailable for this cart weight (%weight kg)' => 'FedEx delivery unavailable for this cart weight (%weight kg)', - 'select a valid status' => 'Select a valid order status', + 'FedEx parcel tracking URL' => 'URL for FedEx tracking WebService', + 'This is the parcel tracking URL for FedEx.' => 'Please indicate FedEx\' tracking WebService URL : last character must be the symbol =', );