TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,936 Commits 1 Branch 0 Tags
69d496715e5ec832cffb41b68a8a91bb5aa928cf
Commit Graph

575 Commits

Author SHA1 Message Date
Guillaume Barral
69d496715e Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch 2014-06-19 13:59:16 +02:00
Guillaume Barral
60124feb17 modification of model Order to not insert two times the order_version (when we insert for the first time an order object) 2014-06-19 12:02:58 +02:00
Franck Allimant
d66d2b3839 PHP-CS fixer pass. 2014-06-19 00:33:24 +02:00
Franck Allimant
f842f90e00 Merge branch 'master' into tinymce 
Conflicts:
	local/modules/Tinymce/templates/backOffice/default/include/tinymce_init.tpl
 2014-06-19 00:16:21 +02:00
Franck Allimant
0d0f04bf29 Added getConfiguredShopUrl() to access url_site variable 2014-06-18 19:34:43 +02:00
Guillaume Barral
6e9412f3ac Add the table order_version to Thelia 2014-06-18 14:22:15 +02:00
Manuel Raynaud
101197c0de various fixes from insight 2014-06-18 09:33:32 +02:00
Franck Allimant
ee47488cc8 getDefaultSaleElements() returns a single ProductSaleElement 2014-06-14 17:45:05 +02:00
Franck Allimant
ec26ebac32 php-cs fixer passed. 2014-06-12 17:10:38 +02:00
Franck Allimant
992100f145 Added helper to chek if number of uses is reached 2014-06-12 16:40:07 +02:00
Manuel Raynaud
2ddc0fb6a3 fix cs 2014-06-11 17:14:13 +02:00
Manuel Raynaud
5edeee6996 fix cs 2014-06-11 16:09:44 +02:00
Manuel Raynaud
4856a5f733 remove unused variable 2014-06-11 15:59:20 +02:00
Manuel Raynaud
6084d9ac00 implement new breadcrumb on image and document edition in the catalog. Fix #460 2014-06-11 14:50:19 +02:00
Manuel Raynaud
476bda3d4a implement new breadcrumb on image and document edition in the catalog 2014-06-11 14:50:19 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Manuel Raynaud
980cd08704 fix cs 2014-06-05 17:39:15 +02:00
Manuel Raynaud
86c34f589c fix payment and delivery form. Fix #434 2014-06-05 17:21:37 +02:00
Benjamin Perche
946a671c4d Fix cs 
modifié:         core/lib/Thelia/Core/Event/SessionEvent.php
	modifié:         core/lib/Thelia/Core/EventListener/SessionListener.php
	modifié:         core/lib/Thelia/Core/TheliaKernelEvents.php
	modifié:         core/lib/Thelia/Model/CartItem.php
 2014-06-04 13:43:03 +02:00
Manuel Raynaud
d439197133 translate product in car. Fix #416 2014-05-30 17:07:55 +02:00
Manuel Raynaud
087fc6e9bf reset modified column after admin connection 2014-05-27 17:09:53 +02:00
Franck Allimant
d576e62082 Removed uses of Base in core/lib/Thelia/Model 2014-05-19 09:50:18 +02:00
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +02:00
Franck Allimant
cae0db00eb Applied Windows version of php-cs script 2014-05-17 12:00:08 +02:00
Franck Allimant
2c7337d8e0 Applied php-cs-fixer with level psr2 2014-05-17 10:56:29 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
90947bcda9 Free shipping restricitions based on Countries and Shipping module 2014-05-16 10:30:15 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Franck Allimant
32542efe28 $chosenDeliveryAddress and $chosenInvoiceAddress are now protected 2014-05-15 19:30:30 +02:00
Franck Allimant
268d5a997d Typo ! 2014-05-15 18:59:48 +02:00
Franck Allimant
683664cb07 Added Model\Module::getModuleInstance() method 2014-05-15 16:50:34 +02:00
Franck Allimant
9c0cc178b4 Added coupon_country and coupon_module tables 2014-05-14 16:35:16 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
4cd2ea6316 complete lang form including money format 2014-05-06 10:53:16 +02:00
Manuel Raynaud
d5c5e167a6 check shipping configuration in delivery loop. Fix #311 2014-05-05 14:37:44 +02:00
Manuel Raynaud
793e66af74 Merge pull request #371 from roadster31/coupons 
Coupons
 2014-05-05 10:58:59 +02:00
Manuel Raynaud
ca9d9c89c5 fix wrong smtp config 2014-05-05 09:56:40 +02:00
Franck Allimant
3b7589ec84 Removed useless transactions 2014-05-02 18:23:04 +02:00
Manuel Raynaud
0b36b2222d implement addCriteriaToPositionQuery method in content model. #360 2014-04-30 10:44:34 +02:00
Manuel Raynaud
d0edbdfd5b change price if needed when customer log in or log out 2014-04-29 11:35:10 +02:00
Manuel Raynaud
406b06e09d use customer permanent discount 2014-04-29 10:56:07 +02:00
Manuel Raynaud
c4320f0ada add discount input on customer form 2014-04-29 10:56:07 +02:00
Manuel Raynaud
c4b2898830 Merge pull request #345 from roadster31/various-fixes 
Various fixes
 2014-04-28 21:56:01 +02:00
Franck Allimant
37f43a0f51 Changed isSubclassOf by implementsInterface 2014-04-28 20:18:08 +02:00
Julien Chanséaume
6553c6ad10 unnecessary code removed 2014-04-28 12:15:08 +02:00
Julien Chanséaume
3bacb0a917 refactore currency calculations in ProductSaleElements 2014-04-28 12:07:45 +02:00
Franck Allimant
d8c2f35446 Added some helper methods 2014-04-26 16:01:05 +02:00
Julien Chanséaume
b86ac88ce4 fix cart item prices when not on default currency 2014-04-25 16:55:20 +02:00
Jérôme Billiras
5197afb87d Load modules by position 2014-04-23 16:33:01 +02:00
Manuel Raynaud
0435478ae8 fix cs 2014-04-22 12:43:57 +02:00