dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,223 Commits 9 Branches 19 Tags
da2db7d799bfd4ce40a092b89c19f6d563bddb90
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 0e45c649d9 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard fe5a54cfcc [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
Rémi Gaillard 5312290774 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
Rémi Gaillard 7576bc18e4 // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard 3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
Rémi Gaillard 532a727cc2 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Rémi Gaillard 2fe8b5cf23 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard 26a3dc2f62 // small fix 2013-05-20 10:58:49 +02:00
Rémi Gaillard 996b8e145f [-] MO: Don't make unnecessary request to ajax cart 2013-05-20 10:50:34 +02:00
Rémi Gaillard a14520f825 Merge pull request #442 from raulgundin/patch-1 
[-] CORE: Fix #PSCFV-9185 Wrong product price display (list by manufacturer)
 2013-05-20 00:53:07 -07:00
Rémi Gaillard 8b95e9f2ca [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 2013-05-17 17:10:11 +02:00
Rémi Gaillard d691e1d403 [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +02:00
Rémi Gaillard ee8da0499b // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard a0423d6226 // small fix 2013-05-15 16:26:02 +02:00
Rémi Gaillard a22138f3c7 // small fix for id_shop and php-cli 2013-05-15 16:23:29 +02:00
Rémi Gaillard 8d0e28291b [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +02:00
Rémi Gaillard 2c10ba5359 [*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things 2013-05-15 14:46:40 +02:00
Rémi Gaillard f33e8d8b4a [-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts 2013-05-14 18:13:07 +02:00
Rémi Gaillard dff200ac9d [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders 2013-05-14 09:53:33 +02:00
Rémi Gaillard ce71def570 Merge pull request #431 from samy-r/dev-add_attribute 
$id_shop_list filtering in addAttribute
 2013-05-14 00:12:55 -07:00
Rémi Gaillard 63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Rémi Gaillard 7eb318b0b0 // small fix 2013-05-02 18:58:05 +02:00
Rémi Gaillard 41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Rémi Gaillard fb3291a08f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
Rémi Gaillard 8996690a65 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Rémi Gaillard bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Rémi Gaillard 71b8e7cc33 // small fix 2013-04-26 16:07:32 +02:00
Rémi Gaillard 60ea65d5fb Merge pull request #407 from zecrazytux/fixracecondition 
[-] Fixes a race condition
 2013-04-26 06:24:56 -07:00
Rémi Gaillard 135689fc1f // small fix on php-cli installer 2013-04-26 11:54:05 +02:00
Rémi Gaillard a56e4fa62d // delete char 2013-04-25 14:20:27 +02:00
Rémi Gaillard 8f23902023 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-25 11:41:09 +02:00
Rémi Gaillard 7f372216cc // update default languages pack 2013-04-25 11:40:54 +02:00
Rémi Gaillard 36b0eae84f Merge pull request #403 from MrManchot/patch-4 
Double 'id_image' definition in product getList
 2013-04-25 02:23:16 -07:00
Rémi Gaillard 2b23268bec [-] BO: Fix htaccess generation for subfolders installation 2013-04-25 11:04:48 +02:00
Rémi Gaillard 9a326bd844 // Also update the tax display for unidentified and guest group on localization import 2013-04-24 19:01:10 +02:00
Rémi Gaillard 913d0d9711 // small text change 2013-04-23 15:51:30 +02:00
Rémi Gaillard 9282e310f4 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
Rémi Gaillard d8453cccfb Merge pull request #398 from djfm/release 
[*] TR : added russian installer tabs
 2013-04-22 09:42:39 -07:00
Rémi Gaillard 4adc9f2ccf Merge pull request #397 from djfm/release 
[*] TR : Fixed wrong use of translation functions
 2013-04-22 08:46:15 -07:00
Rémi Gaillard 20f8709940 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
Rémi Gaillard c96b4ca248 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by 2013-04-19 15:48:18 +02:00
Rémi Gaillard 9c1bf63ab9 // fix display of accessories for products without combinations 2013-04-19 15:15:25 +02:00
Rémi Gaillard ba7f9620c3 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-19 15:14:51 +02:00
Rémi Gaillard 103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
Rémi Gaillard 45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
Rémi Gaillard f24022311e [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard f7a1fdb9e0 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard e7b344adab // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
Rémi Gaillard be250c9ecc // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
Rémi Gaillard 39e3b079dd [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 2013-04-17 18:14:58 +02:00
Rémi Gaillard a172632600 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard 76f584a70d // pscleaner clean address inversion between customers and manufacturers/suppliers 2013-04-17 11:39:11 +02:00
Rémi Gaillard 517a968db7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 14:14:36 +02:00
Rémi Gaillard 3d8b28ac93 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
Rémi Gaillard 7bb98b16f3 [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here 2013-04-16 12:01:04 +02:00
Rémi Gaillard eafaf2de03 // small changes in installer 2013-04-15 14:33:20 +02:00
Rémi Gaillard 7fddcd3f38 [-] BO: Don't delete the directory of modules before upgrade them 2013-04-15 11:17:17 +02:00
Rémi Gaillard 4a1892843a [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
Rémi Gaillard f30749449f // fix for commit 3cbd8444d6 2013-04-12 10:49:30 +02:00
Rémi Gaillard 8d06ff3044 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00
Rémi Gaillard 345ec87993 [-] BO: PSCFV-7685 parent category for root categories after upgrade 2013-04-10 18:52:59 +02:00
Rémi Gaillard 582bc67633 // something was missing in last commit 2013-04-08 17:53:56 +02:00
Rémi Gaillard c6d8b91287 [*] BO: The translation of modules are now made in the theme if modules are overrided or directly in the module folder 2013-04-08 17:50:43 +02:00
Rémi Gaillard 419ed00e58 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs 2013-04-08 14:58:29 +02:00
Rémi Gaillard f310ec5346 [-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675 2013-04-08 11:35:08 +02:00
Rémi Gaillard b101bdca71 // Fix #PSCFV-8599 remove non existant image from css 2013-04-05 17:50:21 +02:00
Rémi Gaillard 2837c0e34e // And now use smarty cache groups for cache ids to be more efficient 2013-04-05 11:57:52 +02:00
Rémi Gaillard 0e418f20cc [*] FO: use subdirectory per template for smarty cache 2013-04-05 11:44:16 +02:00
Rémi Gaillard 6b76e9152d [-] FO: Don't display vat_number field if not required for the country on address.tpl 2013-04-05 11:29:30 +02:00
Rémi Gaillard b1a1e57365 [-] MO: Fix product cover image on blockviewed with multishop 2013-04-05 10:54:04 +02:00
Rémi Gaillard 24947d3ae6 [-] FO: Extension test on file attachment for contact form should not be case sensitive #PSCFV-8616 2013-04-04 19:03:27 +02:00
Rémi Gaillard c67ea6c022 [-] Core: Cache of Cart::getPackageList is now per cart 2013-04-04 14:35:14 +02:00
Rémi Gaillard e83da1f23b [-] BO: Fix the Htaccess rewriting generation when one shop has the rewriting enabled and the last one on the same domain not 2013-04-03 14:43:17 +02:00
Rémi Gaillard 22ab798ea1 // Add again images.inc.php in admin/functions.php 2013-04-03 13:44:32 +02:00
Rémi Gaillard d17849a5cd // remove session check on installer - now it is useless 2013-04-03 13:39:44 +02:00
Rémi Gaillard ccb3723285 [-] Installer: fix installer in PT languahe 2013-04-03 11:36:44 +02:00
Rémi Gaillard b0d1f5c83b Merge pull request #367 from PrestaEdit/patch-24 
[-] Class: Order / Param Module
 2013-04-03 01:18:50 -07:00
Rémi Gaillard 0ba95d6989 // small changes on php cli installer 2013-04-02 17:28:45 +02:00
Rémi Gaillard 5d324a755d [-] BO: Clear cart when customer is changed in back office orders #PSCFV-8520 2013-04-02 16:02:00 +02:00
Rémi Gaillard 1120f46a25 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-02 15:28:11 +02:00
Rémi Gaillard 66f22fd00a // fix cache on hooks for php cli installation 2013-04-02 15:25:10 +02:00
Rémi Gaillard 9517e1a22b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-02 15:22:35 +02:00
Rémi Gaillard f4eee31bf3 [-] Core: Local cache could never be totally cleaned 2013-04-02 15:22:27 +02:00
Rémi Gaillard 857de139b0 // small fix for installer 2013-04-02 12:12:26 +02:00
Rémi Gaillard dec911959f // don't return errors twice on module installation on installer 2013-03-29 17:05:13 +01:00
Rémi Gaillard 94c9491ed7 // something was missing on the last commit 2013-03-29 15:53:26 +01:00
Rémi Gaillard 359af7572d [-] Installer: Switch test of session.save_path to optional test 2013-03-29 15:48:46 +01:00
Rémi Gaillard 83847ebad0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-03-29 14:29:07 +01:00
Rémi Gaillard f29a77cbe8 [*] Installer: Add PHP CLI installer 2013-03-29 14:28:48 +01:00
Rémi Gaillard c2d8853f57 [*] BO: List all modules with an upgrade available on AdminModules header 2013-03-27 18:58:21 +01:00
Rémi Gaillard 286dea8362 // Fix SQL query for tags 2013-03-27 15:38:27 +01:00
Rémi Gaillard 47aa02bdb9 // Fix sql query 2013-03-27 10:40:40 +01:00
Rémi Gaillard a505f8063e // Fix installer in russian 2013-03-26 18:50:37 +01:00
Rémi Gaillard d2db198e4e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-26 18:23:33 +01:00
Rémi Gaillard db1a2fccf9 // Also clear language cache in AdminTranslationsController 2013-03-26 18:23:17 +01:00
Rémi Gaillard a5f5ebb1d8 [-] Core: clean Language:: after adding a new lang 2013-03-26 16:06:50 +01:00
Rémi Gaillard 8b10427883 // Update default translations packs 2013-03-26 15:32:15 +01:00
Rémi Gaillard 09e5037ebd [-] BO: it is now possible to change the default customer/guest/visitor group per shop 2013-03-26 11:45:23 +01:00
Rémi Gaillard d90902b569 // fix for price computation with combination in product page FO 2013-03-26 11:04:07 +01:00