dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph
20989 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac fc9b39968b // remove notice 2013-10-24 11:46:09 +02:00
emilien-puget 92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR 2013-10-24 11:44:52 +02:00
Damien Metzger a34784a15d // Fixed chart for period before the store creation 2013-10-24 11:17:33 +02:00
Damien Metzger d173b2d4cd Merge pull request #880 from djfm/bootstrap 
// use automatic path for css in mail template header
 2013-10-24 01:45:41 -07:00
djfm baed28f1a7 // use automatic path for css in mail template header 2013-10-24 08:37:08 +00:00
Rémi Gaillard 9a7c3dd88f // small fix 2013-10-24 10:14:44 +02:00
gRoussac 81945cef71 [-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879 2013-10-24 10:00:19 +02:00
Gregory Roussac 1cc0134ec3 Merge pull request #879 from neemzy/development 
[-] FO : OPC hide VAT fields fail if there are no company fields
 2013-10-24 00:55:55 -07:00
Fabio Chelly b9de912dd3 [-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign 2013-10-24 09:53:16 +02:00
Damien Metzger e17dd1fdde // theme installation 2013-10-24 09:49:46 +02:00
Tom Panier 6d3640e895 Conditions to hide VAT fields fail if there are no company fields 
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.

This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
 2013-10-24 09:43:50 +02:00
Sarah Lorenzini d9382a0a5b // update mail template 2013-10-24 09:28:04 +02:00
Damien Metzger 9e0125d0b6 // theme installation 2013-10-23 19:09:14 +02:00
gRoussac 56693da6e0 // remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702 2013-10-23 19:02:13 +02:00
Kevin Granger 7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
gRoussac 3e33a259ef [-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base 2013-10-23 18:33:37 +02:00
Rémi Gaillard e1887425fa [*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import 2013-10-23 18:22:53 +02:00
gRoussac 8e506ddff2 [-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts 2013-10-23 18:16:45 +02:00
Vincent Augagneur b38073ad72 //watermark now use bootstrap design 2013-10-23 18:01:23 +02:00
Sarah Lorenzini 7a23c169d6 // update css mail template 2013-10-23 17:58:28 +02:00
Sarah Lorenzini 45bd281504 // update mail templates 2013-10-23 17:53:54 +02:00
Gregory Roussac c72c44f153 Merge pull request #877 from djfm/bootstrap 
// English
 2013-10-23 08:46:16 -07:00
djfm 52622e6be2 // English 2013-10-23 15:33:15 +00:00
Damien Metzger 758b5f7241 // Started to adapt the install to the new template 2013-10-23 17:29:59 +02:00
Damien Metzger 69d5cb4ccd [+] FO : New Responsive, Bootstrap template 2013-10-23 16:56:02 +02:00
Jerome Nadaud 16dfea95e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 16:49:05 +02:00
Jerome Nadaud a27f8bc999 // Fix Stats datepicker 2013-10-23 16:48:55 +02:00
Damien Metzger 466699edcb // Add units to goals configuration 2013-10-23 16:36:04 +02:00
gRoussac 03ad842697 [-] BO : Fix bug #PSCFV-10790, Customer group names not exploded 2013-10-23 16:07:28 +02:00
Damien Metzger 9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Rémi Gaillard 554ab9414f [-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context 2013-10-23 15:08:02 +02:00
Jerome Nadaud ff3455be78 // Products combinations form bootstraping 2013-10-23 15:03:28 +02:00
Rémi Gaillard 747ec9a2c4 // notice on carrierwizard when step back 2013-10-23 14:50:30 +02:00
Jerome Nadaud c30d103410 // Check if exist children opt. in employees 2013-10-23 14:49:22 +02:00
Jerome Nadaud fee2da6980 // Add sublime project file to gitignore 2013-10-23 14:35:24 +02:00
Rémi Gaillard be1299d8d7 // small fix 2013-10-23 14:19:19 +02:00
Jerome Nadaud 4e1b4cdf90 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 12:11:10 +02:00
Jerome Nadaud 0bf6410773 //Fix save and stay combinations problem 2013-10-23 12:10:36 +02:00
Rémi Gaillard 2279b959fe // small changes on orders view 2013-10-23 12:10:02 +02:00
Gregory Roussac 2f5e15e2b1 Merge pull request #874 from PhpMadman/patch-5 
[-] FO: Mobile theme removed width on message product select
 2013-10-23 03:04:25 -07:00
Rémi Gaillard 8662ef12b4 // small changes on orders view 2013-10-23 11:59:28 +02:00
PhpMadman 373604fc97 [-] FO: removed width on message product select 
Limiting select could make the user think the select is not working if they click to much to the left on bigger screens
 2013-10-23 11:52:35 +02:00
gRoussac 101b37b40a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-23 11:45:26 +02:00
gRoussac ad4ecefcf9 [-] FO : Prevent fatal error on getUniqReference when order not loaded 2013-10-23 11:44:12 +02:00
Kevin Granger 5ee716ff9e // fix admin edit countries 2013-10-23 11:18:31 +02:00
Fabio Chelly 3e999ab591 [-] MO blockcart 
#PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js
 2013-10-23 10:56:48 +02:00
Fabio Chelly 010ad76e6f Merge remote-tracking branch 'origin/development' into development 2013-10-23 10:55:35 +02:00
Fabio Chelly 5fd3ad5adf [*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop 2013-10-23 10:55:23 +02:00
Jerome Nadaud 45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Rémi Gaillard 6cddb57ce3 [-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724 2013-10-23 10:34:00 +02:00