Compare commits
15 Commits
dc001f84e1
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 638811f588 | |||
| 988b1f7d99 | |||
| 5826bd7942 | |||
| 49b1a63ecc | |||
| a09aa11f16 | |||
| 8d68ac278f | |||
| 5e4df025c6 | |||
| 0359d96baf | |||
| e288ca861d | |||
| 1e68dad756 | |||
| ff2e8cf473 | |||
| 891708a830 | |||
| ff4d20c91f | |||
| e8d80a3765 | |||
| 1865ce3d3e |
1
.gitignore
vendored
@@ -5,3 +5,4 @@
|
||||
/.well-known/
|
||||
/local/session/
|
||||
/stats/
|
||||
/core/vendor/composer/
|
||||
|
||||
@@ -62,7 +62,8 @@
|
||||
"ramsey/array_column": "~1.1",
|
||||
"propel/propel": "dev-thelia-2.3",
|
||||
"commerceguys/addressing": "0.8.*",
|
||||
"thelia/paypal-module": "~3.0.0"
|
||||
"thelia/paypal-module": "~3.0.0",
|
||||
"giggsey/libphonenumber-for-php": "^8.1.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"fzaninotto/faker": "1.5.*",
|
||||
|
||||
136
composer.lock
generated
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"_readme": [
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "8fbc68f5bab568a5ff0999a67a6fef4f",
|
||||
"content-hash": "9adcc003d8cd7a382d5fedd229b5e860",
|
||||
"packages": [
|
||||
{
|
||||
"name": "commerceguys/addressing",
|
||||
@@ -349,17 +349,134 @@
|
||||
"abandoned": "tecnickcom/tcpdf",
|
||||
"time": "2013-09-12T17:00:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "giggsey/libphonenumber-for-php",
|
||||
"version": "8.12.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
|
||||
"reference": "cb79970730aacaedb74c8288214a5576572fa7b0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/cb79970730aacaedb74c8288214a5576572fa7b0",
|
||||
"reference": "cb79970730aacaedb74c8288214a5576572fa7b0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-mbstring": "*",
|
||||
"giggsey/locale": "^1.7",
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"pear/pear-core-minimal": "^1.9",
|
||||
"pear/pear_exception": "^1.0",
|
||||
"pear/versioncontrol_git": "^0.5",
|
||||
"phing/phing": "^2.7",
|
||||
"php-coveralls/php-coveralls": "^1.0|^2.0",
|
||||
"phpunit/phpunit": "^4.8.36|^5.0",
|
||||
"symfony/console": "^2.8|^3.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "8.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"libphonenumber\\": "src/"
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/src/data/",
|
||||
"/src/carrier/data/",
|
||||
"/src/geocoding/data/",
|
||||
"/src/timezone/data/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"Apache-2.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Joshua Gigg",
|
||||
"email": "giggsey@gmail.com",
|
||||
"homepage": "https://giggsey.com/"
|
||||
}
|
||||
],
|
||||
"description": "PHP Port of Google's libphonenumber",
|
||||
"homepage": "https://github.com/giggsey/libphonenumber-for-php",
|
||||
"keywords": [
|
||||
"geocoding",
|
||||
"geolocation",
|
||||
"libphonenumber",
|
||||
"mobile",
|
||||
"phonenumber",
|
||||
"validation"
|
||||
],
|
||||
"time": "2020-05-19T11:20:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "giggsey/locale",
|
||||
"version": "1.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/giggsey/Locale.git",
|
||||
"reference": "b07f1eace8072ccc61445ad8fbd493ff9d783043"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/giggsey/Locale/zipball/b07f1eace8072ccc61445ad8fbd493ff9d783043",
|
||||
"reference": "b07f1eace8072ccc61445ad8fbd493ff9d783043",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"pear/pear-core-minimal": "^1.9",
|
||||
"pear/pear_exception": "^1.0",
|
||||
"pear/versioncontrol_git": "^0.5",
|
||||
"phing/phing": "~2.7",
|
||||
"php-coveralls/php-coveralls": "^1.0|^2.0",
|
||||
"phpunit/phpunit": "^4.8|^5.0",
|
||||
"symfony/console": "^2.8|^3.0|^4.0",
|
||||
"symfony/filesystem": "^2.8|^3.0|^4.0",
|
||||
"symfony/finder": "^2.8|^3.0|^4.0",
|
||||
"symfony/process": "^2.8|^3.0|^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Giggsey\\Locale\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Joshua Gigg",
|
||||
"email": "giggsey@gmail.com",
|
||||
"homepage": "http://giggsey.com/"
|
||||
}
|
||||
],
|
||||
"description": "Locale functions required by libphonenumber-for-php",
|
||||
"time": "2020-07-07T11:16:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "imagine/imagine",
|
||||
"version": "v0.6.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/avalanche123/Imagine.git",
|
||||
"url": "https://github.com/php-imagine/Imagine.git",
|
||||
"reference": "149041d2a1b517107bfe270ca2b1a17aa341715d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/avalanche123/Imagine/zipball/149041d2a1b517107bfe270ca2b1a17aa341715d",
|
||||
"url": "https://api.github.com/repos/php-imagine/Imagine/zipball/149041d2a1b517107bfe270ca2b1a17aa341715d",
|
||||
"reference": "149041d2a1b517107bfe270ca2b1a17aa341715d",
|
||||
"shasum": ""
|
||||
},
|
||||
@@ -714,6 +831,7 @@
|
||||
"php",
|
||||
"stylesheet"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2015-12-30T05:47:36+00:00"
|
||||
},
|
||||
{
|
||||
@@ -811,6 +929,7 @@
|
||||
"rest",
|
||||
"sdk"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2016-04-22T03:29:29+00:00"
|
||||
},
|
||||
{
|
||||
@@ -1001,6 +1120,7 @@
|
||||
"array_column",
|
||||
"column"
|
||||
],
|
||||
"abandoned": "it-for-free/array_column",
|
||||
"time": "2015-03-20T22:07:39+00:00"
|
||||
},
|
||||
{
|
||||
@@ -1159,6 +1279,7 @@
|
||||
"keywords": [
|
||||
"stack"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2014-11-23T20:37:11+00:00"
|
||||
},
|
||||
{
|
||||
@@ -1212,6 +1333,7 @@
|
||||
"mail",
|
||||
"mailer"
|
||||
],
|
||||
"abandoned": "symfony/mailer",
|
||||
"time": "2015-06-06T14:19:39+00:00"
|
||||
},
|
||||
{
|
||||
@@ -1378,6 +1500,7 @@
|
||||
],
|
||||
"description": "Symfony ClassLoader Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"abandoned": true,
|
||||
"time": "2016-01-03T15:33:41+00:00"
|
||||
},
|
||||
{
|
||||
@@ -1545,6 +1668,7 @@
|
||||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"abandoned": "symfony/error-handler",
|
||||
"time": "2016-01-13T10:28:07+00:00"
|
||||
},
|
||||
{
|
||||
@@ -2916,6 +3040,7 @@
|
||||
],
|
||||
"description": "Symfony Security Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"abandoned": true,
|
||||
"time": "2016-01-14T09:10:32+00:00"
|
||||
},
|
||||
{
|
||||
@@ -4450,5 +4575,6 @@
|
||||
"platform": {
|
||||
"php": ">=5.4"
|
||||
},
|
||||
"platform-dev": []
|
||||
"platform-dev": [],
|
||||
"plugin-api-version": "1.1.0"
|
||||
}
|
||||
|
||||
BIN
composer.phar
Normal file
@@ -162,8 +162,17 @@ class MailerFactory
|
||||
if (! empty($to)) {
|
||||
$instance = $this->createEmailMessage($messageCode, $from, $to, $messageParameters, $locale, $cc, $bcc);
|
||||
|
||||
$sentCount = $this->send($instance, $failedRecipients);
|
||||
try {
|
||||
$instance = $this->createEmailMessage($messageCode, $from, $to, $messageParameters, $locale, $cc, $bcc, $replyTo);
|
||||
|
||||
$sentCount = $this->send($instance, $failedRecipients);
|
||||
} catch (\Exception $ex) {
|
||||
Tlog::getInstance()->addError(
|
||||
"Error while sending email message $messageCode: ".$ex->getMessage()
|
||||
);
|
||||
}
|
||||
|
||||
// $sentCount = $this->send($instance, $failedRecipients);
|
||||
if ($sentCount == 0) {
|
||||
Tlog::getInstance()->addError(
|
||||
Translator::getInstance()->trans(
|
||||
|
||||
BIN
local/colissimo-label/ORD000000008739.pdf
Normal file
BIN
local/media/images/module/MondialRelay-28-logo-mr.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
local/media/images/module/colissimo_logo_q-33.jpg
Normal file
|
After Width: | Height: | Size: 9.1 MiB |
BIN
local/media/images/module/images-29.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
BIN
local/media/images/module/signatures-1-32.jpg
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
local/media/images/product/0039-ars-navy-08-2707.jpg
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
local/media/images/product/0039-gitane-01-4181.jpg
Normal file
|
After Width: | Height: | Size: 569 KiB |
BIN
local/media/images/product/0039-gitane-02-4180.jpg
Normal file
|
After Width: | Height: | Size: 308 KiB |
BIN
local/media/images/product/0039-gitane-03-4182.jpg
Normal file
|
After Width: | Height: | Size: 338 KiB |
BIN
local/media/images/product/0039-gitane-04-4183.jpg
Normal file
|
After Width: | Height: | Size: 991 KiB |
BIN
local/media/images/product/0039-gitane-05-4184.jpg
Normal file
|
After Width: | Height: | Size: 1.3 MiB |
BIN
local/media/images/product/0039-poeme-943-3613.jpg
Normal file
|
After Width: | Height: | Size: 427 KiB |
|
After Width: | Height: | Size: 176 KiB |
BIN
local/media/images/product/0213-en-code-urbain-01-4273.jpg
Normal file
|
After Width: | Height: | Size: 589 KiB |
BIN
local/media/images/product/0213-en-code-urbain-02-4274.jpg
Normal file
|
After Width: | Height: | Size: 438 KiB |
BIN
local/media/images/product/0213-en-code-urbain-03-4275.jpg
Normal file
|
After Width: | Height: | Size: 356 KiB |
BIN
local/media/images/product/0213-en-code-urbain-04-4276.jpg
Normal file
|
After Width: | Height: | Size: 681 KiB |
BIN
local/media/images/product/0213-en-code-urbain-05-4277.jpg
Normal file
|
After Width: | Height: | Size: 1.2 MiB |
|
After Width: | Height: | Size: 12 MiB |
BIN
local/media/images/product/0213-rayure-geo-jade-01-4279.jpg
Normal file
|
After Width: | Height: | Size: 487 KiB |
BIN
local/media/images/product/0213-rayure-geo-jade-02-4278.jpg
Normal file
|
After Width: | Height: | Size: 345 KiB |
BIN
local/media/images/product/0213-rayure-geo-jade-03-4280.jpg
Normal file
|
After Width: | Height: | Size: 351 KiB |
BIN
local/media/images/product/0213-rayure-geo-jade-04-4281.jpg
Normal file
|
After Width: | Height: | Size: 837 KiB |
|
After Width: | Height: | Size: 103 KiB |
|
After Width: | Height: | Size: 97 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
After Width: | Height: | Size: 109 KiB |
|
After Width: | Height: | Size: 110 KiB |
BIN
local/media/images/product/0237-ecume-ora-fluo-04-4298.jpg
Normal file
|
After Width: | Height: | Size: 801 KiB |
BIN
local/media/images/product/0237-ecume-ros-fluo-01-4299.jpg
Normal file
|
After Width: | Height: | Size: 457 KiB |
BIN
local/media/images/product/0237-ecume-ros-fluo-04-4300.jpg
Normal file
|
After Width: | Height: | Size: 618 KiB |
BIN
local/media/images/product/0237-neige_sanguine-1431-3739.jpg
Normal file
|
After Width: | Height: | Size: 346 KiB |
BIN
local/media/images/product/0237-vegetal-ecume-04-4296.jpg
Normal file
|
After Width: | Height: | Size: 743 KiB |
BIN
local/media/images/product/0248-dinan_u-rouge-02-3263.png
Normal file
|
After Width: | Height: | Size: 430 KiB |
BIN
local/media/images/product/0248-dinan_u-rouge-04-3264.png
Normal file
|
After Width: | Height: | Size: 617 KiB |
BIN
local/media/images/product/0248-marine_010-dinan-3265.png
Normal file
|
After Width: | Height: | Size: 185 KiB |
BIN
local/media/images/product/0248-marine_dinan-01-3266.png
Normal file
|
After Width: | Height: | Size: 203 KiB |
BIN
local/media/images/product/0300-gitane-ecru_033-3946.jpg
Normal file
|
After Width: | Height: | Size: 1.1 MiB |
BIN
local/media/images/product/0300-gitane-ecru_038-3944.jpg
Normal file
|
After Width: | Height: | Size: 1.3 MiB |
BIN
local/media/images/product/0300-vegetal-ecru-06-3943.jpg
Normal file
|
After Width: | Height: | Size: 1.0 MiB |
BIN
local/media/images/product/0300-vegetal-ecru_055-3941.jpg
Normal file
|
After Width: | Height: | Size: 330 KiB |
BIN
local/media/images/product/0300-vegetal-ecru_072-3942.jpg
Normal file
|
After Width: | Height: | Size: 939 KiB |
BIN
local/media/images/product/0314-charente-blanc-03-3237.png
Normal file
|
After Width: | Height: | Size: 410 KiB |
BIN
local/media/images/product/0314-charente-blanc-05-3236.png
Normal file
|
After Width: | Height: | Size: 1.1 MiB |
BIN
local/media/images/product/0314-charente-navy-01-2711.jpg
Normal file
|
After Width: | Height: | Size: 89 KiB |
BIN
local/media/images/product/0314-charente-navy-06-2712.jpg
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
local/media/images/product/0335-detente-epice-08-3165.png
Normal file
|
After Width: | Height: | Size: 792 KiB |
BIN
local/media/images/product/0335-detente-noir-17-3164.png
Normal file
|
After Width: | Height: | Size: 839 KiB |
BIN
local/media/images/product/0335-detente-taupe-01-3163.png
Normal file
|
After Width: | Height: | Size: 1.1 MiB |
BIN
local/media/images/product/0360-aix-g-neige-tulipe-04-2826.jpg
Normal file
|
After Width: | Height: | Size: 127 KiB |
BIN
local/media/images/product/0360-aix-neige-dragon-03-2827.jpg
Normal file
|
After Width: | Height: | Size: 107 KiB |
|
After Width: | Height: | Size: 120 KiB |
|
After Width: | Height: | Size: 123 KiB |
BIN
local/media/images/product/0380-chatelaillon-navy-04-2714.jpg
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
local/media/images/product/0380-chatelaillon-navy-65-2715.jpg
Normal file
|
After Width: | Height: | Size: 107 KiB |
|
After Width: | Height: | Size: 108 KiB |
|
After Width: | Height: | Size: 124 KiB |
|
After Width: | Height: | Size: 177 KiB |
|
After Width: | Height: | Size: 122 KiB |
|
After Width: | Height: | Size: 128 KiB |
|
After Width: | Height: | Size: 128 KiB |
BIN
local/media/images/product/0405-neige_pomme-10-4170.jpg
Normal file
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 120 KiB |
|
After Width: | Height: | Size: 152 KiB |
BIN
local/media/images/product/0433-blanc-e-shop-bd-1-4712.jpg
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
local/media/images/product/0433-blanc-e-shop-bd-2-4713.jpg
Normal file
|
After Width: | Height: | Size: 86 KiB |
BIN
local/media/images/product/0433-blanc-e-shop-bd-3-4715.jpg
Normal file
|
After Width: | Height: | Size: 86 KiB |
BIN
local/media/images/product/0433-blanc-e-shop-bd-4-4714.jpg
Normal file
|
After Width: | Height: | Size: 87 KiB |
BIN
local/media/images/product/0433-elfycouleurs-navy-16-2797.jpg
Normal file
|
After Width: | Height: | Size: 74 KiB |
|
After Width: | Height: | Size: 316 KiB |
|
After Width: | Height: | Size: 530 KiB |
BIN
local/media/images/product/0433-poeme-955-3347.jpg
Normal file
|
After Width: | Height: | Size: 8.1 MiB |
BIN
local/media/images/product/0433-poeme-968-3348.jpg
Normal file
|
After Width: | Height: | Size: 9.5 MiB |
BIN
local/media/images/product/0433-poeme-975-3349.jpg
Normal file
|
After Width: | Height: | Size: 22 MiB |
BIN
local/media/images/product/0455-la-rochelle-navy-13-2716.jpg
Normal file
|
After Width: | Height: | Size: 89 KiB |
BIN
local/media/images/product/0455-la-rochelle-navy-33-2717.jpg
Normal file
|
After Width: | Height: | Size: 104 KiB |
BIN
local/media/images/product/0457-marans-neige-dragon-03-2813.jpg
Normal file
|
After Width: | Height: | Size: 112 KiB |
BIN
local/media/images/product/0457-marans-neige-marine-13-2814.jpg
Normal file
|
After Width: | Height: | Size: 117 KiB |
BIN
local/media/images/product/0461-ecume_noir-1294-3847.jpg
Normal file
|
After Width: | Height: | Size: 128 KiB |
BIN
local/media/images/product/0461-ecume_noir-1307-3849.jpg
Normal file
|
After Width: | Height: | Size: 399 KiB |
BIN
local/media/images/product/0461-ecume_noir-1310-3851.jpg
Normal file
|
After Width: | Height: | Size: 319 KiB |
BIN
local/media/images/product/0461-ecume_noir-1317-3852.jpg
Normal file
|
After Width: | Height: | Size: 138 KiB |
BIN
local/media/images/product/0486-navy_cras3308-4076.png
Normal file
|
After Width: | Height: | Size: 594 KiB |
BIN
local/media/images/product/0511-blanc_sanguine-626-4119.jpg
Normal file
|
After Width: | Height: | Size: 50 KiB |
BIN
local/media/images/product/0511-blanc_sanguine-636-4118.jpg
Normal file
|
After Width: | Height: | Size: 67 KiB |
BIN
local/media/images/product/0513-blanc_marine-04-3099.png
Normal file
|
After Width: | Height: | Size: 798 KiB |
BIN
local/media/images/product/0524-charlene-ml-blanc-02-2751.jpg
Normal file
|
After Width: | Height: | Size: 91 KiB |
|
After Width: | Height: | Size: 125 KiB |
|
After Width: | Height: | Size: 135 KiB |
|
After Width: | Height: | Size: 92 KiB |
BIN
local/media/images/product/0552-tango-01-3234.png
Normal file
|
After Width: | Height: | Size: 422 KiB |
BIN
local/media/images/product/0552-tango-04-3235.png
Normal file
|
After Width: | Height: | Size: 654 KiB |
|
After Width: | Height: | Size: 90 KiB |
|
After Width: | Height: | Size: 90 KiB |
BIN
local/media/images/product/0562-marine_chrystale-01-3242.png
Normal file
|
After Width: | Height: | Size: 723 KiB |