TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,776 Commits 1 Branch 0 Tags
980cd0870491ecd503e4e36d1e400f398b3ea015
Commit Graph

2445 Commits

Author SHA1 Message Date
Manuel Raynaud
980cd08704 fix cs 2014-06-05 17:39:15 +02:00
Manuel Raynaud
83ed4aa833 fix copy/past issue 2014-06-05 17:21:37 +02:00
Manuel Raynaud
a4e28e5561 implement search on content loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
57cf2d1a10 implement seach on content loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
ac028a70b5 implement seach on category loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
86c34f589c fix payment and delivery form. Fix #434 2014-06-05 17:21:37 +02:00
Julien Chanséaume
fc15d466b4 Fixed issue when installing Thelia on database with special characters 2014-06-05 14:01:47 +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
Guillaume Barral
2a7ea88d13 As the customerController, the method performAdditionalUpdateAction is useless as long as we have an <input type="hidden" name="page" /> AND a well configured successUrl :) 2014-06-04 09:02:55 +02:00
Guillaume Barral
a0eb7603ce correction of the method performAdditionalUpdateAction 2014-06-04 08:40:17 +02:00
Guillaume Barral
eb895bc544 Add pagination to the product list (backOffice) 2014-06-03 12:35:52 +02:00
Manuel Raynaud
d439197133 translate product in car. Fix #416 2014-05-30 17:07:55 +02:00
Manuel Raynaud
fe620a5a3b force default locale when uploading new document. Fix #403 2014-05-30 16:43:26 +02:00
Manuel Raynaud
eb13849b79 fix parameter in document loop. Fix #405 2014-05-30 12:22:22 +02:00
Manuel Raynaud
8370158f9d fix saves & close action on document and images. Fix #402 2014-05-30 11:49:03 +02:00
Manuel Raynaud
ee6bb052ad Merge pull request #439 from roadster31/coupon-types 
Coupon types
 2014-05-28 15:58:01 +02:00
Franck Allimant
567fee839c Added RemoveAmountOnCategories coupon type 2014-05-28 12:02:56 +02:00
Manuel Raynaud
087fc6e9bf reset modified column after admin connection 2014-05-27 17:09:53 +02:00
Guillaume Barral
2587f208c6 add argument id to the order_product loop 2014-05-27 08:44:49 +02:00
Manuel Raynaud
6eaea72043 don't catch exception when javscript assets are processed 2014-05-26 11:07:02 +02:00
Manuel Raynaud
ad469298bc Merge pull request #428 from roadster31/coupon-types 
Temporary fix for #427
 2014-05-23 00:32:26 +02:00
Franck Allimant
e4029c9fdd Temporary fix for #427 2014-05-22 23:39:34 +02:00
Manuel Raynaud
2ace0796e8 session is now initialize using dispatcher 2014-05-20 09:44:04 +02:00
Manuel Raynaud
ec50b30ff6 Merge pull request #417 from Yochima/yochima-branch 
set the placedOrder in the createManual function
 2014-05-19 11:12:32 +02:00
Guillaume Barral
bcd817f9d9 initialize the order in the $event object in the createManual function. 
We need to initialize it because we have to  use the placedOrder instead
 2014-05-19 11:06:19 +02:00
Guillaume Barral
c4be881ab8 add the test of a non null order in the $event object in createManual function 2014-05-19 11:01:19 +02:00
Manuel Raynaud
1a08cabd6e Merge pull request #413 from roadster31/coupon-types 
Coupon types
 2014-05-19 10:50:53 +02:00
Franck Allimant
d576e62082 Removed uses of Base in core/lib/Thelia/Model 2014-05-19 09:50:18 +02:00
Guillaume Barral
db94749dc0 set the placedOrder in the createManual function 2014-05-19 09:43:42 +02:00
Manuel Raynaud
d153ca04c3 Merge pull request #415 from zzuutt/master 
Ajout d'une d'une variable en sortie dans la boucle cart
 2014-05-19 09:37:40 +02:00
Franck Allimant
12fb52dc88 Optimisation : 60*60*24 -> 86400 2014-05-18 20:21:23 +02:00
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +02:00
Nicolas Léon
957140a5b7 Allow sorting by creation date for Content Loop 2014-05-18 13:43:56 +02:00
Nicolas Léon
811186f4aa Allow sorting by creation date for Content Loop 2014-05-18 13:34:41 +02:00
zzuutt
482302e2b2 Ajout d'une variable de sortie a la boucle cart 
n'ayant pas trouve le moyen dans le cart de faire afficher la reference de la combinaison au lieu de la reference du produit, je demande si cela est possible de rajouter celle-ci.

La variable '$PRODUCT_SALE_ELEMENTS_REF'

Merci
 2014-05-17 23:23:57 +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
ef142ca077 Applied php-cs-fixer 2014-05-17 10:56:28 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
9cdac6d50e Fixes french translation. 2014-05-16 11:12:24 +02:00
Franck Allimant
90947bcda9 Free shipping restricitions based on Countries and Shipping module 2014-05-16 10:30:15 +02:00
Franck Allimant
ffd842cbf6 Added FREE_SHIPPING_FOR_COUNTRIES_LIST and FREE_SHIPPING_FOR_MODULES_LIST 2014-05-16 10:07:25 +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
Franck Allimant
112cb8eeb0 Added ForSomeCustomer condition 2014-05-12 23:37:43 +02:00
Franck Allimant
eb0054d21e Typo 2014-05-10 22:52:19 +02:00
Franck Allimant
ad0aafeb31 Fixex #399 2014-05-10 22:51:20 +02:00