-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New: #15 Make the dolibarr version mandatory into label of any product
- Loading branch information
Showing
17 changed files
with
498 additions
and
61 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
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
20 changes: 20 additions & 0 deletions
20
dolistore/modules/blockmysales/override/classes/Product.php
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,20 @@ | ||
| <?php | ||
| class Product extends ProductCore | ||
| { | ||
| public $module_version; | ||
| public $dolibarr_min; | ||
| public $dolibarr_min_status; | ||
| public $dolibarr_max; | ||
| public $dolibarr_max_status; | ||
|
|
||
| public function __construct($id_product = null, $full = false, $id_lang = null, $id_shop = null, Context $context = null) | ||
| { | ||
| Product::$definition['fields']['module_version'] = array('type' => self::TYPE_STRING, 'validate' => 'isString', 'size' => 7); | ||
| Product::$definition['fields']['dolibarr_min'] = array('type' => self::TYPE_STRING, 'validate' => 'isString', 'size' => 5); | ||
| Product::$definition['fields']['dolibarr_min_status'] = array('type' => self::TYPE_BOOL, 'validate' => 'isBool'); | ||
| Product::$definition['fields']['dolibarr_max'] = array('type' => self::TYPE_STRING, 'validate' => 'isString', 'size' => 5); | ||
| Product::$definition['fields']['dolibarr_max_status'] = array('type' => self::TYPE_BOOL, 'validate' => 'isBool'); | ||
|
|
||
| parent::__construct($id_product, $full, $id_lang, $id_shop, $context); | ||
| } | ||
| } |
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,35 @@ | ||
| <?php | ||
| /* | ||
| * 2007-2014 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Academic Free License (AFL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/afl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to license@prestashop.com so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
| * versions in the future. If you wish to customize PrestaShop for your | ||
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <contact@prestashop.com> | ||
| * @copyright 2007-2014 PrestaShop SA | ||
| * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| */ | ||
|
|
||
| header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); | ||
| header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); | ||
|
|
||
| header("Cache-Control: no-store, no-cache, must-revalidate"); | ||
| header("Cache-Control: post-check=0, pre-check=0", false); | ||
| header("Pragma: no-cache"); | ||
|
|
||
| header("Location: ../"); | ||
| exit; |
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,35 @@ | ||
| <?php | ||
| /* | ||
| * 2007-2014 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Academic Free License (AFL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/afl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to license@prestashop.com so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
| * versions in the future. If you wish to customize PrestaShop for your | ||
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <contact@prestashop.com> | ||
| * @copyright 2007-2014 PrestaShop SA | ||
| * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| */ | ||
|
|
||
| header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); | ||
| header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); | ||
|
|
||
| header("Cache-Control: no-store, no-cache, must-revalidate"); | ||
| header("Cache-Control: post-check=0, pre-check=0", false); | ||
| header("Pragma: no-cache"); | ||
|
|
||
| header("Location: ../"); | ||
| exit; |
78 changes: 78 additions & 0 deletions
78
dolistore/modules/blockmysales/override/modules/blockviewed/blockviewed.php
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,78 @@ | ||
| <?php | ||
| if (!defined('_PS_VERSION_')) | ||
| exit; | ||
|
|
||
| class BlockViewedOverride extends BlockViewed | ||
| { | ||
| public function hookRightColumn($params) | ||
| { | ||
| $productsViewed = (isset($params['cookie']->viewed) && !empty($params['cookie']->viewed)) ? array_slice(array_reverse(explode(',', $params['cookie']->viewed)), 0, Configuration::get('PRODUCTS_VIEWED_NBR')) : array(); | ||
|
|
||
| if (count($productsViewed)) | ||
| { | ||
| $defaultCover = Language::getIsoById($params['cookie']->id_lang).'-default'; | ||
|
|
||
| $productIds = implode(',', array_map('intval', $productsViewed)); | ||
| $productsImages = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' | ||
| SELECT MAX(image_shop.id_image) id_image, p.id_product, p.dolibarr_min, p.dolibarr_min_status, p.dolibarr_max, p.dolibarr_max_status, il.legend, product_shop.active, pl.name, pl.description_short, pl.link_rewrite, cl.link_rewrite AS category_rewrite | ||
| FROM '._DB_PREFIX_.'product p | ||
| '.Shop::addSqlAssociation('product', 'p').' | ||
| LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = p.id_product'.Shop::addSqlRestrictionOnLang('pl').') | ||
| LEFT JOIN '._DB_PREFIX_.'image i ON (i.id_product = p.id_product)'. | ||
| Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').' | ||
| LEFT JOIN '._DB_PREFIX_.'image_lang il ON (il.id_image = image_shop.id_image AND il.id_lang = '.(int)($params['cookie']->id_lang).') | ||
| LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = product_shop.id_category_default'.Shop::addSqlRestrictionOnLang('cl').') | ||
| WHERE p.id_product IN ('.$productIds.') | ||
| AND pl.id_lang = '.(int)($params['cookie']->id_lang).' | ||
| AND cl.id_lang = '.(int)($params['cookie']->id_lang).' | ||
| GROUP BY product_shop.id_product' | ||
| ); | ||
|
|
||
| $productsImagesArray = array(); | ||
| foreach ($productsImages as $pi) | ||
| $productsImagesArray[$pi['id_product']] = $pi; | ||
|
|
||
| $productsViewedObj = array(); | ||
| foreach ($productsViewed as $productViewed) | ||
| { | ||
| $obj = (object)'Product'; | ||
| if (!isset($productsImagesArray[$productViewed]) || (!$obj->active = $productsImagesArray[$productViewed]['active'])) | ||
| continue; | ||
| else | ||
| { | ||
| $obj->id = (int)($productsImagesArray[$productViewed]['id_product']); | ||
| $obj->id_image = (int)$productsImagesArray[$productViewed]['id_image']; | ||
| $obj->cover = (int)($productsImagesArray[$productViewed]['id_product']).'-'.(int)($productsImagesArray[$productViewed]['id_image']); | ||
| $obj->legend = $productsImagesArray[$productViewed]['legend']; | ||
| $obj->name = $productsImagesArray[$productViewed]['name']; | ||
| $obj->description_short = $productsImagesArray[$productViewed]['description_short']; | ||
| $obj->link_rewrite = $productsImagesArray[$productViewed]['link_rewrite']; | ||
| $obj->category_rewrite = $productsImagesArray[$productViewed]['category_rewrite']; | ||
| // $obj is not a real product so it cannot be used as argument for getProductLink() | ||
| $obj->product_link = $this->context->link->getProductLink($obj->id, $obj->link_rewrite, $obj->category_rewrite); | ||
| $obj->dolibarr_min = $productsImagesArray[$productViewed]['dolibarr_min']; | ||
| $obj->dolibarr_min_status = $productsImagesArray[$productViewed]['dolibarr_min_status']; | ||
| $obj->dolibarr_max = $productsImagesArray[$productViewed]['dolibarr_max']; | ||
| $obj->dolibarr_max_status = $productsImagesArray[$productViewed]['dolibarr_max_status']; | ||
|
|
||
| if (!isset($obj->cover) || !$productsImagesArray[$productViewed]['id_image']) | ||
| { | ||
| $obj->cover = $defaultCover; | ||
| $obj->legend = ''; | ||
| } | ||
| $productsViewedObj[] = $obj; | ||
| } | ||
| } | ||
|
|
||
| if (!count($productsViewedObj)) | ||
| return; | ||
|
|
||
| $this->smarty->assign(array( | ||
| 'productsViewedObj' => $productsViewedObj, | ||
| 'mediumSize' => Image::getSize('medium'))); | ||
|
|
||
| return $this->display(__FILE__, 'blockviewed.tpl'); | ||
| } | ||
| return; | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
dolistore/modules/blockmysales/override/modules/blockviewed/index.php
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,35 @@ | ||
| <?php | ||
| /* | ||
| * 2007-2014 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Academic Free License (AFL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/afl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to license@prestashop.com so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
| * versions in the future. If you wish to customize PrestaShop for your | ||
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <contact@prestashop.com> | ||
| * @copyright 2007-2014 PrestaShop SA | ||
| * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| */ | ||
|
|
||
| header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); | ||
| header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); | ||
|
|
||
| header("Cache-Control: no-store, no-cache, must-revalidate"); | ||
| header("Cache-Control: post-check=0, pre-check=0", false); | ||
| header("Pragma: no-cache"); | ||
|
|
||
| header("Location: ../"); | ||
| exit; |
Oops, something went wrong.