diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 38706964a..a1176e2f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,19 +6,23 @@
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
+
@@ -594,16 +598,12 @@
-
-
-
-
@@ -1249,6 +1249,7 @@
+
@@ -1262,6 +1263,14 @@
+
+
+
+
+
+
+
+
@@ -1373,12 +1382,17 @@
+
-
+
+
+
+
+
@@ -1417,7 +1431,14 @@
-
+
+
+
+
+
+
+
+ 1605796595986
@@ -1454,7 +1475,21 @@
1610554291167
-
+
+ 1610990827481
+
+
+
+ 1610990827481
+
+
+ 1610991008627
+
+
+
+ 1610991008627
+
+
@@ -1488,7 +1523,9 @@
-
+
+
+
@@ -1498,6 +1535,16 @@
14
+
+ file://$PROJECT_DIR$/local/modules/OrderCreation/Controller/Admin/OrderCreationAdminController.php
+ 172
+
+
+
+ file://$PROJECT_DIR$/local/modules/LivraisonForfaitaire/LivraisonForfaitaire.php
+ 25
+
+
diff --git a/local/modules/LivraisonForfaitaire/Config/config.xml b/local/modules/LivraisonForfaitaire/Config/config.xml
new file mode 100644
index 000000000..ea7c54c2b
--- /dev/null
+++ b/local/modules/LivraisonForfaitaire/Config/config.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/local/modules/LivraisonForfaitaire/Config/module.xml b/local/modules/LivraisonForfaitaire/Config/module.xml
new file mode 100644
index 000000000..30f374738
--- /dev/null
+++ b/local/modules/LivraisonForfaitaire/Config/module.xml
@@ -0,0 +1,28 @@
+
+
+ LivraisonForfaitaire\LivraisonForfaitaire
+
+ Permet de gérer des montants de frais de livraison forfaitaires, pour les commandes passées dans le backOffice
+
+
+ Permet de gérer des montants de frais de livraison forfaitaires, pour les commandes passées dans le backOffice
+
+
+ en_US
+ fr_FR
+
+ 1.0.0
+
+
+ Laurent LE CORRE
+ laurent@thecoredev.fr
+
+
+ delivery
+ 2.2.0
+ other
+ 0
+ 0
+
diff --git a/local/modules/LivraisonForfaitaire/LivraisonForfaitaire.php b/local/modules/LivraisonForfaitaire/LivraisonForfaitaire.php
new file mode 100644
index 000000000..194ebdb31
--- /dev/null
+++ b/local/modules/LivraisonForfaitaire/LivraisonForfaitaire.php
@@ -0,0 +1,55 @@
+getAreaForCountry($country)) {
+ $select = $this->getRequest()->get('select-forfait');
+ if ($select !== null && $select !== "")
+ $postage = $select;
+ else
+ $postage = $area->getPostage();
+
+ } else {
+ throw new \InvalidArgumentException("Country or Area should not be null");
+ }
+
+ return $postage === null ? 0 : $postage;
+ }
+
+ /**
+ * This method is called by the Delivery loop, to check if the current module has to be displayed to the customer.
+ * Override it to implements your delivery rules/
+ *
+ * If you return true, the delivery method will de displayed to the customer
+ * If you return false, the delivery method will not be displayed
+ *
+ * @param Country $country the country to deliver to.
+ *
+ * @return boolean
+ */
+ public function isValidDelivery(Country $country)
+ {
+ // We should find an area for the country.
+ return null !== $this->getAreaForCountry($country);
+ }
+
+}
diff --git a/local/modules/LivraisonForfaitaire/Readme.md b/local/modules/LivraisonForfaitaire/Readme.md
new file mode 100644
index 000000000..e5e0144a2
--- /dev/null
+++ b/local/modules/LivraisonForfaitaire/Readme.md
@@ -0,0 +1,55 @@
+# Livraison Forfaitaire
+
+Add a short description here. You can also add a screenshot if needed.
+
+## Installation
+
+### Manually
+
+* Copy the module into ```/local/modules/``` directory and be sure that the name of the module is LivraisonForfaitaire.
+* Activate it in your thelia administration panel
+
+### Composer
+
+Add it in your main thelia composer.json file
+
+```
+composer require your-vendor/livraison-forfaitaire-module:~1.0
+```
+
+## Usage
+
+Explain here how to use your module, how to configure it, etc.
+
+## Hook
+
+If your module use one or more hook, fill this part. Explain which hooks are used.
+
+
+## Loop
+
+If your module declare one or more loop, describe them here like this :
+
+[loop name]
+
+### Input arguments
+
+|Argument |Description |
+|--- |--- |
+|**arg1** | describe arg1 with an exemple. |
+|**arg2** | describe arg2 with an exemple. |
+
+### Output arguments
+
+|Variable |Description |
+|--- |--- |
+|$VAR1 | describe $VAR1 variable |
+|$VAR2 | describe $VAR2 variable |
+
+### Exemple
+
+Add a complete exemple of your loop
+
+## Other ?
+
+If you have other think to put, feel free to complete your readme as you want.
diff --git a/local/modules/LivraisonForfaitaire/composer.json b/local/modules/LivraisonForfaitaire/composer.json
new file mode 100644
index 000000000..32fccc246
--- /dev/null
+++ b/local/modules/LivraisonForfaitaire/composer.json
@@ -0,0 +1,11 @@
+{
+ "name": "your-vendor/livraison-forfaitaire-module",
+ "license": "LGPL-3.0+",
+ "type": "thelia-module",
+ "require": {
+ "thelia/installer": "~1.1"
+ },
+ "extra": {
+ "installer-name": "LivraisonForfaitaire"
+ }
+}
\ No newline at end of file
diff --git a/local/modules/ReCaptcha/I18n/frontOffice/default/en_US.php b/local/modules/ReCaptcha/I18n/frontOffice/default/en_US.php
new file mode 100644
index 000000000..0b4fa142b
--- /dev/null
+++ b/local/modules/ReCaptcha/I18n/frontOffice/default/en_US.php
@@ -0,0 +1,4 @@
+ 'The displayed english string',
+);
diff --git a/local/modules/ReCaptcha/I18n/frontOffice/default/fr_FR.php b/local/modules/ReCaptcha/I18n/frontOffice/default/fr_FR.php
new file mode 100644
index 000000000..ae2da0176
--- /dev/null
+++ b/local/modules/ReCaptcha/I18n/frontOffice/default/fr_FR.php
@@ -0,0 +1,8 @@
+ 'Erreur',
+ 'Secret key' => 'Clé secrète',
+ 'Site key' => 'Clé du site',
+ 'Sorry, it seems that you\'re not human.' => 'Désolé, il semblerait que vous ne soyez pas un être humain.'
+);
diff --git a/log/.htaccess b/log/.htaccess
deleted file mode 100755
index ff2beb844..000000000
--- a/log/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-order deny,allow
-deny from all
diff --git a/templates/frontOffice/sterivein/ajax/order-delivery-module-list.html b/templates/frontOffice/sterivein/ajax/order-delivery-module-list.html
index 8784ec736..6d4f1adbd 100644
--- a/templates/frontOffice/sterivein/ajax/order-delivery-module-list.html
+++ b/templates/frontOffice/sterivein/ajax/order-delivery-module-list.html
@@ -3,7 +3,7 @@
{if $smarty.get.back == '1'}
{$exclude = "0"}
{else}
- {$exclude = "40"}
+ {$exclude = "40,48"}
{/if}
{form name="thelia.order.delivery"}
@@ -49,7 +49,17 @@
{if $POSTAGE >= 0}
- {format_money number=$POSTAGE symbol={currency attr='symbol'}}
+ {if $CODE eq "LivraisonForfaitaire"}
+ {assign var="montantsChaine" value={config key="livraisons_forfaitaires.montants"}|default:"0"}
+ {assign var="montantsTableau" value=";"|explode:"$montantsChaine"}
+
+ {else}
+ {format_money number=$POSTAGE symbol={currency attr='symbol'}}
+ {/if}
{else}
{/if}
diff --git a/web/index_dev.php b/web/index_dev.php
index f276c0c60..8fcdc97e0 100644
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -24,8 +24,7 @@ require __DIR__ . '/../core/bootstrap.php';
$trustedIp = array(
'::1',
'127.0.0.1',
- '82.229.232.53',
- '217.128.222.247'
+ '90.1.209.212',
);
$request = Request::createFromGlobals();
diff --git a/web/tinymce b/web/tinymce
index 780f72fdc..39f46e48b 120000
--- a/web/tinymce
+++ b/web/tinymce
@@ -1 +1 @@
-/var/www/clients/client8/web16/web/thelia/local/modules/Tinymce/Resources/js/tinymce
\ No newline at end of file
+/Volumes/Dev/Sources/Clients/sterivein/thelia/local/modules/Tinymce/Resources/js/tinymce
\ No newline at end of file