Version 4.0.27

OPEN-DSI · Nov 23, 2018 · d6c4502 · d6c4502
1 parent 08babb8
commit d6c4502
Show file tree

Hide file tree

Showing 15 changed files with 452 additions and 174 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,22 @@
 # ChangeLog
 
+## 4.0.27.0
+
+- Ajout d'une variable global ECOMMERCENG_WOOCOMMERCE_VAT_NUMBER_META_NAME pour renseigner le nom de la meta donnée correspondant à la TVA client.
+- Correction de la prise en consideration du pays lors de la creation du tiers.
+- Ajout d'une variable global ECOMMERCENG_WOOCOMMERCE_DEFAULT_LANG_OTHER_COUNTRY pour renseigner la langue par défaut si le pays du tiers est different de sa société sinon laisse vide
+- Création d'un nouveau tiers si le nom de la société de facturation est different de celui de livraison sur une commande et rattache le contact de livraison à celui-ci.
+- Ne synchronise maintenant que les nouveaux tiers de Woocmmerce vers Dolibarr.
+- Récupère tous les types de tiers (quelques soit le role de l'utilisateur).
+- Une société peut être lié à plusieurs utilisateurs de woocommerce.
+- Corrections synchronisations des contacts lors de la synchronisation des tiers de Woocmmerce vers Dolibarr.
+- Support la fusion des sociétés.
+
+## 4.0.26.0
+
+- Ajout du choix du type de prix sur WooCommerce (régulier ou de vente) synchronisé avec le prix de vente sur Dolibarr.
+- Correction synchronisation du prix de vente minimum de ECommerce vers Dolibarr.
+
 ## 4.0.25.0
 
 - La suppression des liens des produits supprime aussi les catégories de la boutique sur les produits.

diff --git a/admin/eCommerceSetup.php b/admin/eCommerceSetup.php
@@ -257,6 +257,8 @@
                 );
             }
 
+            $ecommerceProductSynchPrice = GETPOST('ecommerce_product_synch_price', 'alpha');
+
             $ecommerceProductSynchDirection = array(
                 'image' => GETPOST('ecommerce_product_image_synch_direction', 'alpha'),
                 'ref' => GETPOST('ecommerce_product_ref_synch_direction', 'alpha'),
@@ -274,6 +276,7 @@
                 'payment_cond' => $_POST['ecommerce_payment_cond'],
                 'realtime_dtoe' => $ecommerceRealtimeDolibarrToECommerce,
                 'product_synch_direction' => $ecommerceProductSynchDirection,
+                'product_synch_price' => $ecommerceProductSynchPrice,
             );
         }
 
@@ -292,10 +295,38 @@
             if ($siteDb->type == 2) { // Woocommerce
                 $result = ecommerceng_add_extrafields($db, $langs, [
                     [
+                        'attrname' => "ecommerceng_description_{$conf->entity}",
+                        'label' => 'ECommercengWoocommerceDescription',
+                        'type' => 'text',
+                        'pos' => 1,
+                        'size' => '',
+                        'elementtype' => 'product',
+                        'unique' => 0,
+                        'required' => 0,
+                        'default_value' => '',
+                        'param' => '',
+                        'alwayseditable' => 1,
+                        'perms' => '',
+                        'list' => 1,
+                    ],[
+                        'attrname' => "ecommerceng_short_description_{$conf->entity}",
+                        'label' => 'ECommercengWoocommerceShortDescription',
+                        'type' => 'text',
+                        'pos' => 2,
+                        'size' => '',
+                        'elementtype' => 'product',
+                        'unique' => 0,
+                        'required' => 0,
+                        'default_value' => '',
+                        'param' => '',
+                        'alwayseditable' => 1,
+                        'perms' => '',
+                        'list' => 1,
+                    ],[
                         'attrname' => "ecommerceng_wc_status_{$siteDb->id}_{$conf->entity}",
                         'label' => $langs->trans('ECommercengWoocommerceStatus', $siteDb->name),
                         'type' => 'select',
-                        'pos' => 1,
+                        'pos' => 3,
                         'size' => '',
                         'elementtype' => 'product',
                         'unique' => 0,
@@ -311,10 +342,38 @@
                         'perms' => '',
                         'list' => 1,
                     ],[
-                        'attrname' => "ecommerceng_description_{$conf->entity}",
-                        'label' => 'ECommercengWoocommerceDescription',
-                        'type' => 'text',
-                        'pos' => 2,
+                        'attrname' => "ecommerceng_tax_class_{$siteDb->id}_{$conf->entity}",
+                        'label' => $langs->trans('ECommercengWoocommerceTaxClass', $siteDb->name),
+                        'type' => 'sellist',
+                        'pos' => 4,
+                        'size' => '',
+                        'elementtype' => 'product',
+                        'unique' => 0,
+                        'required' => 0,
+                        'default_value' => '',
+                        'param' => array('options' => array("c_ecommerceng_tax_class:label:code::active=1 AND site_id={$siteDb->id} AND entity={$conf->entity}" => null)),
+                        'alwayseditable' => 1,
+                        'perms' => '',
+                        'list' => 1,
+                    /*],[
+                        'attrname' => "ecommerceng_wc_regular_price_{$siteDb->id}_{$conf->entity}",
+                        'label' => $langs->trans('ECommercengWoocommerceRegularPrice', $siteDb->name),
+                        'type' => 'price',
+                        'pos' => 5,
+                        'size' => '',
+                        'elementtype' => 'product',
+                        'unique' => 0,
+                        'required' => 0,
+                        'default_value' => '',
+                        'param' => '',
+                        'alwayseditable' => 1,
+                        'perms' => '',
+                        'list' => 1,*/
+                    ],[
+                        'attrname' => "ecommerceng_wc_sale_price_{$siteDb->id}_{$conf->entity}",
+                        'label' => $langs->trans('ECommercengWoocommerceSalePrice', $siteDb->name),
+                        'type' => 'price',
+                        'pos' => 6,
                         'size' => '',
                         'elementtype' => 'product',
                         'unique' => 0,
@@ -324,12 +383,11 @@
                         'alwayseditable' => 1,
                         'perms' => '',
                         'list' => 1,
-                    ],
-                    [
-                        'attrname' => "ecommerceng_short_description_{$conf->entity}",
-                        'label' => 'ECommercengWoocommerceShortDescription',
-                        'type' => 'text',
-                        'pos' => 3,
+                    ],[
+                        'attrname' => "ecommerceng_wc_date_on_sale_from_{$siteDb->id}_{$conf->entity}",
+                        'label' => $langs->trans('ECommercengWoocommerceDateOnSaleFrom', $siteDb->name),
+                        'type' => 'date',
+                        'pos' => 7,
                         'size' => '',
                         'elementtype' => 'product',
                         'unique' => 0,
@@ -339,23 +397,21 @@
                         'alwayseditable' => 1,
                         'perms' => '',
                         'list' => 1,
-                    ],
-                    [
-                        'attrname' => "ecommerceng_tax_class_{$siteDb->id}_{$conf->entity}",
-                        'label' => $langs->trans('ECommercengWoocommerceTaxClass', $siteDb->name),
-                        'type' => 'sellist',
-                        'pos' => 4,
+                    ],[
+                        'attrname' => "ecommerceng_wc_date_on_sale_to_{$siteDb->id}_{$conf->entity}",
+                        'label' => $langs->trans('ECommercengWoocommerceDateOnSaleTo', $siteDb->name),
+                        'type' => 'date',
+                        'pos' => 8,
                         'size' => '',
                         'elementtype' => 'product',
                         'unique' => 0,
                         'required' => 0,
                         'default_value' => '',
-                        'param' => array('options' => array("c_ecommerceng_tax_class:label:code::active=1 AND site_id={$siteDb->id} AND entity={$conf->entity}" => null)),
+                        'param' => '',
                         'alwayseditable' => 1,
                         'perms' => '',
                         'list' => 1,
-                    ],
-                    [
+                    ],[
                         'attrname' => "ecommerceng_online_payment_{$conf->entity}",
                         'label' => 'ECommercengWoocommerceOnlinePayment',
                         'type' => 'boolean',
@@ -391,6 +447,20 @@
                         'alwayseditable' => 0,
                         'perms' => '',
                         'list' => 1,
+                    ],[
+                        'attrname' => "ecommerceng_wc_role_{$siteDb->id}_{$conf->entity}",
+                        'label' => $langs->trans('ECommercengWoocommerceCompanyRole', $siteDb->name),
+                        'type' => 'varchar',
+                        'pos' => 0,
+                        'size' => '255',
+                        'elementtype' => 'societe',
+                        'unique' => 0,
+                        'required' => 0,
+                        'default_value' => '',
+                        'param' => '',
+                        'alwayseditable' => 0,
+                        'perms' => '',
+                        'list' => 1,
                     ],
                 ], $error);
             }
@@ -667,6 +737,7 @@
             }
         }
 
+        $ecommerceProductSynchPrice = isset($siteDb->parameters['product_synch_price']) ? $siteDb->parameters['product_synch_price'] : 'regular';
         $ecommerceProductImageSynchDirection = isset($siteDb->parameters['product_synch_direction']['image']) ? $siteDb->parameters['product_synch_direction']['image'] : '';
         $ecommerceProductRefSynchDirection = isset($siteDb->parameters['product_synch_direction']['ref']) ? $siteDb->parameters['product_synch_direction']['ref'] : '';
         $ecommerceProductDescriptionSynchDirection = isset($siteDb->parameters['product_synch_direction']['description']) ? $siteDb->parameters['product_synch_direction']['description'] : '';

diff --git a/admin/tpl/eCommerceSetup.tpl.php b/admin/tpl/eCommerceSetup.tpl.php
@@ -298,6 +298,15 @@
           <td><?php print $langs->trans('Description') ?></td>
         </tr>
 
+        <tr <?php print $bc[$var] ?>>
+          <td><span><?php print $langs->trans('ECommerceWoocommerceProductSyncPrice') ?></span></td>
+          <td>
+            <?php
+              print $form->selectarray('ecommerce_product_synch_price', array(/*'selling'=>$langs->trans('ECommerceWoocommerceSellingPrice'),*/ 'regular'=>$langs->trans('ECommerceWoocommerceRegularPrice')), $ecommerceProductSyncPrice);
+            ?>
+          </td>
+          <td><?php print $langs->trans('ECommerceWoocommerceProductSyncPriceDescription') ?></td>
+        </tr>
         <tr <?php print $bc[$var] ?>>
           <td><span><?php print $langs->trans('ECommerceProductImageSyncDirection') ?></span></td>
           <td>

diff --git a/class/actions_ecommerceng.class.php b/class/actions_ecommerceng.class.php
@@ -220,10 +220,10 @@ function afterODTCreation($parameters, &$object, &$action, $hookmanager)
                     foreach ($sites as $site) {
                         if (!$error) {
                             $eCommerceCommande = new eCommerceCommande($db);
-                            $eCommerceCommande->fetchByCommandeId($commande_id, $site->id);
+                            $eCommerceCommande->fetchByCommandeId($commande_id, $site->id); // TODO $eCommerceCommande->remote_societe_id a rajouter a la table
 
                             $eCommerceSociete = new eCommerceSociete($db);
-                            $eCommerceSociete->fetchByFkSociete($societe_id, $site->id);
+                            $eCommerceSociete->fetchByFkSociete($societe_id, $site->id); // TODO a qui donnée l'auteur du media si plusieur utilisateur lié a la societe
 
                             if ($eCommerceCommande->remote_id > 0 && $eCommerceSociete->remote_id > 0) {
                                 $eCommerceSynchro = new eCommerceSynchro($db, $site);
@@ -299,10 +299,10 @@ function afterPDFCreation($parameters, &$object, &$action, $hookmanager)
                     foreach ($sites as $site) {
                         if (!$error) {
                             $eCommerceCommande = new eCommerceCommande($db);
-                            $eCommerceCommande->fetchByCommandeId($commande_id, $site->id);
+                            $eCommerceCommande->fetchByCommandeId($commande_id, $site->id); // TODO $eCommerceCommande->remote_societe_id a rajouter a la table
 
                             $eCommerceSociete = new eCommerceSociete($db);
-                            $eCommerceSociete->fetchByFkSociete($societe_id, $site->id);
+                            $eCommerceSociete->fetchByFkSociete($societe_id, $site->id); // TODO a qui donnée l'auteur du media si plusieur utilisateur lié a la societe
 
                             if ($eCommerceCommande->remote_id > 0 && $eCommerceSociete->remote_id > 0) {
                                 $eCommerceSynchro = new eCommerceSynchro($db, $site);