dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,372 Commits 9 Branches 19 Tags
8d39f3250650ca08e189572c404da7c19267e81a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 8d39f32506 [-] BO: Fix tax rule edition - unique tax rule can't be edited 2013-07-16 11:52:05 +02:00
Rémi Gaillard ee1187d821 [-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query 2013-07-15 11:00:35 +02:00
Rémi Gaillard e34289b0b7 // fix product warehouses 2013-07-12 18:53:22 +02:00
Rémi Gaillard e23854d143 // Add currency ID on default modules cache id 2013-07-12 17:49:38 +02:00
Rémi Gaillard 0928efb112 // small fix 2013-07-12 11:17:30 +02:00
Rémi Gaillard 4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Rémi Gaillard d8a444335f Merge pull request #524 from ChristopheBoucaut/development 
Update OrderDetailController.php
 2013-07-11 08:26:13 -07:00
Rémi Gaillard d0cf8fce18 // small fix 2013-07-11 17:04:29 +02:00
Rémi Gaillard 20b5449231 [*] Core: that is now easier to get links for another shop 2013-07-11 16:40:40 +02:00
Rémi Gaillard 17ee071bdf Merge pull request #540 from axometeam/patch-7 
[*] BO : Correct the getList() request for quantity and id_product
 2013-07-11 06:40:17 -07:00
Rémi Gaillard 004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Rémi Gaillard c0cdd0a0e1 Merge pull request #547 from PiotrKaczor/patch-1 
[*] MO : pscleaner reset employees notyfications
 2013-07-11 00:46:30 -07:00
Rémi Gaillard 2578ffb6e1 Merge pull request #552 from codl/development 
[-] WS: do not escape shop name overzealously
 2013-07-11 00:44:52 -07:00
Rémi Gaillard 7b62144220 [-] Core: ObjectModel::toggleStatus should change only active field on multishop with global context #PSCFV-9707 2013-07-09 11:19:58 +02:00
Rémi Gaillard 18b247be94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-08 16:07:43 +02:00
Rémi Gaillard f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders 2013-07-08 16:07:20 +02:00
Rémi Gaillard 4b88e8cc06 // John Doe is really a big scammer ! #PSCFV-9434 2013-07-08 11:17:12 +02:00
Rémi Gaillard 12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 2013-07-04 17:00:27 +02:00
Rémi Gaillard 6b71ec8b09 [-] BO: product supplier price should not be converted on product page #PSCFV-9420 2013-07-02 15:45:12 +02:00
Rémi Gaillard c5fc26ed0b // same for unregister hook 2013-07-01 16:30:53 +02:00
Rémi Gaillard 09359d011f [-] MO: exec hook on hook registration #PSCFV-8977 2013-07-01 16:12:33 +02:00
Rémi Gaillard cf9c73a854 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-28 10:19:03 +02:00
Rémi Gaillard ec3095ac32 [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 2013-06-28 10:18:49 +02:00
Rémi Gaillard c025024b40 // fix php warning if no image is associated to the producr 2013-06-27 18:14:07 +02:00
Rémi Gaillard 9bafc25878 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-27 15:41:57 +02:00
Rémi Gaillard 17579de481 [-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers 2013-06-27 15:41:37 +02:00
Rémi Gaillard 3524ccc99b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-26 18:13:38 +02:00
Rémi Gaillard e33e5229b4 [-] Installer: Fix some sql queries 2013-06-26 18:13:09 +02:00
Rémi Gaillard 9257dc80c2 [-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context 2013-06-26 14:17:45 +02:00
Rémi Gaillard c01619dfe3 // Change administrator access fixture 2013-06-26 12:05:36 +02:00
Rémi Gaillard f73eb070ab // small fix 2013-06-25 15:50:36 +02:00
Rémi Gaillard 36c7b9df48 [-] BO: This is now not possible to move a tab with id_parent = 0 to an another tab 2013-06-24 18:25:38 +02:00
Rémi Gaillard 68540f1887 [-] BO: Stock should not appears on product listing when stock management is disabled #PSCFV-8207 2013-06-19 11:35:24 +02:00
Rémi Gaillard c5069aaa15 [-] WS: Fix accessories duplication on product update 2013-06-17 18:56:09 +02:00
Rémi Gaillard 909a459e5d // miss ; 2013-06-14 11:49:04 +02:00
Rémi Gaillard fafb7fdef7 [-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table 2013-06-13 15:05:55 +02:00
Rémi Gaillard f5dfb12e4d [-] BO: association of product attributes on associating a product to another shop #PSCFV-8735 2013-06-13 14:30:21 +02:00
Rémi Gaillard e8288c5d7a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-13 12:02:09 +02:00
Rémi Gaillard 5bf4c17f4a [-] WS: Fix webservice sort for multishop fields #PSCFV-5634 2013-06-13 12:01:51 +02:00
Rémi Gaillard 5d6d06f8fb [-] BO: Fix #PSCFV-9428 features duplicated with multishop on Feature::getFeatures() 2013-06-12 18:24:14 +02:00
Rémi Gaillard 1cd9d1bb7a [-] FO: Fix shop restriction on features #PSCFV-7848 2013-06-12 17:38:46 +02:00
Rémi Gaillard b3a823f876 [-] BO: Fix #PSCFV-7763 Re-inject quantities after deleting a product from a order 2013-06-12 17:08:00 +02:00
Rémi Gaillard 91ececef1a // missing return statement 2013-06-11 12:19:04 +02:00
Rémi Gaillard 7ed9ceb593 [-] BO: Addresses are now totally deleted from the database if not used on a order 2013-06-11 12:18:05 +02:00
Rémi Gaillard f3000f6c65 [-] BO: Fix #PSCFV-6657 translations of overriden admin templates 2013-06-10 18:23:59 +02:00
Rémi Gaillard 1838003353 [-] WS: Fix #PSCFI-7009 product prices on orders with specific prices 2013-06-10 16:59:02 +02:00
Rémi Gaillard d64b5efd10 [-] WS: Fix deletion of product_features on product update #PSCFI-6740 2013-06-10 16:23:16 +02:00
Rémi Gaillard 1688c7b0e6 [-] FO: Fix no image displayed for products in the cart when it was added from another store in multishop #PSCFV-9385 2013-06-07 15:37:38 +02:00
Rémi Gaillard b51641ca49 [-] WS: Fix memory leak when getting synopsis 2013-06-06 16:59:03 +02:00
Rémi Gaillard ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 2013-06-04 16:27:47 +02:00
Rémi Gaillard 5d9d3938e5 // small change on optimization tips for smarty 2013-06-04 15:20:09 +02:00
Rémi Gaillard 05767a213e [*] Installer: you can now choose to send an email to the administrator after installation with php-cli 2013-06-04 14:21:18 +02:00
Rémi Gaillard 4c5b060e92 [-] Core: Hook actionPaymentConfirmation should also be called for PS_OS_WS_PAYMENT order statuse 2013-06-04 12:08:31 +02:00
Rémi Gaillard 88369ef1f6 [-] FO: Fix Category::getSubCategories() default group used #PSCFV-9356 2013-06-03 18:18:54 +02:00
Rémi Gaillard 6d84d5833d [-] FO: Fix Order::getOrdersTotalPaid() reference is now a string #PSCFV-9342 2013-06-03 11:49:55 +02:00
Rémi Gaillard 8ecc6313c1 [-] BO: Fix combinations duplication on multishop with context all for the product duplication #PSCFV-9020 2013-05-29 12:08:15 +02:00
Rémi Gaillard 08023b4bc3 [-] FO: Fix Carrier::getDeliveredCountries for multishop #PSCFV-9279 2013-05-28 17:41:20 +02:00
Rémi Gaillard 1cd0135aff [-] MO: Fix double html entities on link edition in the blocktopmenumodule #PSCFV-8808 2013-05-28 11:05:51 +02:00
Rémi Gaillard fce9a0e285 // same for attributes and attributegroups 2013-05-27 18:13:13 +02:00
Rémi Gaillard 3de79c7015 // same for attributes and attributegroups 2013-05-24 11:33:58 +02:00
Rémi Gaillard 6f901cea37 [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
Rémi Gaillard 3b5f18a96d [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
Rémi Gaillard de945adf79 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer 2013-05-22 15:46:30 +02:00
Rémi Gaillard 5fed3e99e0 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer 2013-05-22 15:46:30 +02:00
Rémi Gaillard 1ab6befe0d Merge pull request #447 from djfm/development 
// parse error
 2013-05-22 05:14:50 -07:00
Rémi Gaillard da109d56f6 Merge pull request #447 from djfm/development 
// parse error
 2013-05-22 05:14:50 -07:00
Rémi Gaillard c7a056f301 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
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 b65423f232 [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +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 2542e97164 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +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 0ddc7e0e4b // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard 7576bc18e4 // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard b573b39acb [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +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 7d5830af94 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +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 7f92b45c33 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard 2fe8b5cf23 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard 614556ec3d // small fix 2013-05-20 10:58:49 +02:00
Rémi Gaillard 26a3dc2f62 // small fix 2013-05-20 10:58:49 +02:00
Rémi Gaillard 1edbebf8f5 [-] MO: Don't make unnecessary request to ajax cart 2013-05-20 10:50:34 +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 a508be0a07 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 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 626e556575 [-] 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 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 d096a5845e [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +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 963dfe8ca2 // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard ee8da0499b // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard da8c21d644 // small fix 2013-05-15 16:26:02 +02:00
Rémi Gaillard a0423d6226 // small fix 2013-05-15 16:26:02 +02:00
Rémi Gaillard 932d949392 // small fix for id_shop and php-cli 2013-05-15 16:23:29 +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 7ca9356f65 [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +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 a9684804d5 [*] 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 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