This repository has been archived by the owner on Oct 4, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #132 from OPEN-DSI/2024_rc_marque
Changement marque, page support, CI, coquilles
- Loading branch information
Showing
22 changed files
with
913 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| "dol_min": 14, | ||
| "dol_max": 18 | ||
| "dlb_min_version": 14, | ||
| "dlb_max_version": 18 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| include: | ||
| - project: "opendsi/ci-templates" | ||
| file: "/dolibarr/module/main.yml" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,27 @@ | ||
| # WooSync, synchronize Woocommerce and Dolibarr | ||
| WooSync | ||
| ======================== | ||
| Module de synchronisation entre Dolibarr et les plateformes e-commerce WooCommerce. | ||
|
|
||
|
|
||
| ## Documentation | ||
|
|
||
|
|
||
| Lien vers notre [documentation](https://link.easya.solutions/woosync_doc) | ||
|
|
||
|
|
||
|
|
||
| <!-- # WooSync, synchronize Woocommerce and Dolibarr | ||
| ## You have to rename the folder to ecommerceng when you download the zip file or make a git clone. In other case the module will not work | ||
| Use it at you onwn risk Open-DSI does not provide support for the use, installation or bug fixing for this software. For this you have to acquire a time from our sales service https://www.easya.solutions/contact. You can also consult our company for any installation, configuration or development services. | ||
| Use it at you onwn risk Easya Solution does not provide support for the use, installation or bug fixing for this software. For this you have to acquire a time from our sales service https://www.easya.solutions/contact. You can also consult our company for any installation, configuration or development services. | ||
| Before any use, please refer to the documentatio to check the available functionnality | ||
| Before any use, please refer to the documentation to check the available functionnality | ||
| https://link.easya.solutions/woosync_doc | ||
| Utilisation à vos risques et périls. Open-DSI ne fournit pas de support à l’utilisation, à l'installation ni de correction de bugs pour ce logiciel. Pour cela vous devrez faire l’acquisition d’un crédit temps auprès de notre service commercial : https://www.easya.solutions/contact. Vous pouvez également nous consulter pour toute prestation d’installation, configuration ou développement. | ||
| Utilisation à vos risques et périls. Easya Solutions ne fournit pas de support à l’utilisation, à l'installation ni de correction de bugs pour ce logiciel. Pour cela vous devrez faire l’acquisition d’un crédit temps auprès de notre service commercial : https://www.easya.solutions/contact. Vous pouvez également nous consulter pour toute prestation d’installation, configuration ou développement. | ||
| Avant toute utilisation, merci de prendre connaissance de la documentation pour vérifier si le module répond en l'état à vos besoins | ||
| https://link.easya.solutions/woosync_doc | ||
| https://link.easya.solutions/woosync_doc --> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 14.0.1 | ||
| 14.0.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
| /* Copyright (C) 2007-2015 Laurent Destailleur <[email protected]> | ||
| * Copyright (C) 2019 Open-DSI <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /** | ||
| * \file htdocs/custom/ecommerceng/admin/about.php | ||
| * \ingroup ecommerceng | ||
| * \brief Page about of ecommerceng module | ||
| */ | ||
|
|
||
| // Change this following line to use the correct relative path (../, ../../, etc) | ||
| $res=0; | ||
| if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory | ||
| if (! $res && file_exists("../../../main.inc.php")) $res=@include '../../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory | ||
| if (! $res) die("Include of main fails"); | ||
| require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; | ||
| dol_include_once('/ecommerceng/lib/eCommerce.lib.php'); | ||
| dol_include_once('/ecommerceng/lib/opendsi_common.lib.php'); | ||
| dol_include_once('/ecommerceng/core/modules/modECommerceNg.class.php'); | ||
|
|
||
| $langs->loadLangs(array("admin", "orders", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng")); | ||
|
|
||
| if (!$user->admin) accessforbidden(); | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| $object = new eCommerceSite($db); | ||
| if (!($id > 0)) { | ||
| $sites = $object->listSites(); | ||
| if (!empty($sites)) { | ||
| $id = array_values($sites)[0]['id']; | ||
| } | ||
| $action = ''; | ||
| } | ||
| if ($id > 0) { | ||
| $result = $object->fetch($id); | ||
| if ($result < 0) { | ||
| accessforbidden($object->errorsToString()); | ||
| } elseif ($result == 0) { | ||
| $langs->load('errors'); | ||
| accessforbidden($langs->trans('ErrorRecordNotFound')); | ||
| } | ||
| } else { | ||
| accessforbidden($langs->trans('ErrorRecordNotFound')); | ||
| } | ||
|
|
||
| /*if (empty($conf->facture->enabled) && empty($conf->facture->enabled)) { | ||
| accessforbidden($langs->trans('ModuleDisabled')); | ||
| } */ | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| /** | ||
| * View | ||
| */ | ||
|
|
||
| $wikihelp='EN:ECommerceNg_En|FR:ECommerceNg_Fr|ES:ECommerceNg_Es'; | ||
| llxHeader('', $langs->trans("ECommerceSetup"), $wikihelp); | ||
|
|
||
| $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; | ||
| print load_fiche_titre($langs->trans("ECommerceSetup"),$linkback,'title_setup'); | ||
| print "<br>\n"; | ||
|
|
||
|
|
||
| $head=ecommercengConfigSitePrepareHead($object); | ||
|
|
||
| print dol_get_fiche_head($head, 'changelog', $langs->trans("Module107100Name"), 0, 'opendsi@ecommerceng'); | ||
|
|
||
| $changelog = opendsi_common_getChangeLog('ecommerceng'); | ||
|
|
||
| print '<div class="moduledesclong">'."\n"; | ||
| print (!empty($changelog) ? $changelog : $langs->trans("NotAvailable")); | ||
| print '<div>'."\n"; | ||
|
|
||
| print dol_get_fiche_end(); | ||
|
|
||
|
|
||
| llxFooter(); | ||
|
|
||
| $db->close(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,18 +54,18 @@ function __construct($db) | |
| $this->family = 'easya'; | ||
| $this->familyinfo = array('easya' => array('position' => '001', 'label' => $langs->trans("easyaFamily"))); | ||
| // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) | ||
| $this->name = 'EcommerceNg'; // Must be same than value used for if $conf->ecommerceng->enabled | ||
| $this->name = preg_replace('/^mod/i', '', get_class($this)); // Must be same than value used for if $conf->ecommerceng->enabled | ||
| // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) | ||
| $this->description = "Module to synchronise Dolibarr with ECommerce platform (currently ecommerce supported: WooCommerce)"; | ||
| $this->descriptionlong = "See page https://wiki.dolibarr.org/index.php/Module_Magento_EN for more information"; | ||
| $this->editor_name = '<b>Easya Solutions</b> (Ex Open-Dsi)'; | ||
| $this->editor_name = '<b>Easya Solutions</b>)'; | ||
| $this->editor_web = 'https://easya.solutions'; | ||
| $this->editor_url = "https://easya.solutions"; | ||
| $this->editor_email = '[email protected]'; | ||
|
|
||
| // Possible values for version are: 'development', 'experimental', 'dolibarr' or version | ||
| $this->version = file_get_contents(__DIR__.'/../../VERSION'); | ||
| $this->url_last_version = 'https://git.open-dsi.fr/dolibarr-extension/'.strtolower($this->name).'/-/raw/2022.5.3/VERSION'; | ||
| $this->url_last_version = 'https://git.open-dsi.fr/dolibarr-extension/'.strtolower($this->name).'/-/raw/2024/VERSION'; | ||
| // 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) | ||
|
|
@@ -114,8 +114,9 @@ function __construct($db) | |
| // Dependencies | ||
| $this->depends = array("modSociete", "modProduct", "modCategorie", "modWebServices"); // List of modules id that must be enabled if this module is enabled | ||
| $this->requiredby = array(); // List of modules id to disable if this one is disabled | ||
| $this->phpmin = array(5, 3); // Minimum version of PHP required by module | ||
| $this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module | ||
| $easya_info = json_decode(file_get_contents(__DIR__.'/../../.easya_info.json')); | ||
| $this->phpmin = explode('.', $easya_info->php_min_version); // Minimum version of PHP required by module | ||
| $this->need_dolibarr_version = explode('.', $easya_info->dlb_min_version); // Minimum version of Dolibarr required by module | ||
| $this->langfiles = array("ecommerce@ecommerceng", "woocommerce@ecommerceng"); | ||
|
|
||
| // Constants | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.