Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
- Correction de la prise en compte de l'adresse de livraison
Browse files Browse the repository at this point in the history
 (si au moins le nom ou le prenom, et au moins un des 2 champs d'adresses, et le code postal et la ville sont renseignés alors on la traite comme adresse de livraison
  sinon dans le cas contraire on prend l'adresse de l'expediteur)
  • Loading branch information
kkhelifa-opendsi committed Feb 3, 2023
1 parent 8661df2 commit bd513f6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# ChangeLog

## 4.1.34.0
- Correction de la prise en compte de l'adresse de livraison
(si au moins le nom ou le prenom, et au moins un des 2 champs d'adresses, et le code postal et la ville sont renseignés alors on la traite comme adresse de livraison
sinon dans le cas contraire on prend l'adresse de l'expediteur)

## 4.1.33.0
- Correction sur le champ "total_tva" qui était nommé en "tva" en version antérieure à 14

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1790,9 +1790,9 @@ public function convertOrderDataIntoProcessedData($remote_data)

// Set shipping's address
$sContact = $remote_data->shipping;
if (!empty($sContact->address_1) || !empty($sContact->address_2) ||
!empty($sContact->postcode) || !empty($sContact->city) ||
!empty($sContact->country)
if ((!empty($sContact->first_name) || !empty($sContact->last_name)) &&
(!empty($sContact->address_1) || !empty($sContact->address_2)) &&
!empty($sContact->postcode) && !empty($sContact->city)
) {
if ($bContact->first_name != $sContact->first_name || $bContact->last_name != $sContact->last_name ||
$bContact->address_1 != $sContact->address_1 || $bContact->address_2 != $sContact->address_2 ||
Expand Down
2 changes: 1 addition & 1 deletion core/modules/modECommerceNg.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function __construct($db)
$this->editor_url = 'http://www.open-dsi.fr';

// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = '4.1.33';
$this->version = '4.1.34';
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
Expand Down

0 comments on commit bd513f6

Please sign in to comment.