Guillaume Barral
|
243e44f571
|
Target thelia_release_version changed to 3
|
2014-06-18 14:34:24 +02:00 |
|
Guillaume Barral
|
6e9412f3ac
|
Add the table order_version to Thelia
|
2014-06-18 14:22:15 +02:00 |
|
Manuel Raynaud
|
8aac09ad90
|
Merge pull request #479 from lunika/fixes
various fixes from insight
|
2014-06-18 10:26:19 +02:00 |
|
Manuel Raynaud
|
d14a2d24f2
|
fix cs
|
2014-06-18 10:06:10 +02:00 |
|
Manuel Raynaud
|
101197c0de
|
various fixes from insight
|
2014-06-18 09:33:32 +02:00 |
|
Manuel Raynaud
|
588be42e0f
|
Merge pull request #473 from roadster31/coupon-end
Major coupon types refactoring.
|
2014-06-17 21:11:14 +02:00 |
|
Franck Allimant
|
cbf2eae842
|
Written coupons unit tests
|
2014-06-17 19:58:56 +02:00 |
|
Julien
|
97db5baa44
|
Merge pull request #476 from lunika/date
refactor formatDate function and create test
|
2014-06-17 17:01:10 +02:00 |
|
Manuel Raynaud
|
f9e0db06c1
|
refactor formatDate function and create test
|
2014-06-17 15:41:47 +02:00 |
|
Franck Allimant
|
6f12882850
|
Added missing $this->setFieldsValue($effects);
|
2014-06-17 15:28:35 +02:00 |
|
Manuel Raynaud
|
cc55c730bb
|
Merge pull request #478 from Yochima/yochima-branch
Allow to search a customer in the default template if $search is not nul...
|
2014-06-17 15:08:32 +02:00 |
|
Guillaume Barral
|
8196690458
|
Add link in template-edit to go to Attributes and features edition (this is more intuitive)
|
2014-06-17 11:48:35 +02:00 |
|
Guillaume Barral
|
816a9b81ca
|
Allow to search a customer in the default template if $search is not null
|
2014-06-17 11:19:16 +02:00 |
|
Franck Allimant
|
5534780e3c
|
Added the FreeProduct coupon.
|
2014-06-17 00:45:55 +02:00 |
|
Franck Allimant
|
8b74eae911
|
php-cs pass
|
2014-06-17 00:43:10 +02:00 |
|
Franck Allimant
|
63f00d82b9
|
Using 0 as default value if some loop parameters are not defined
|
2014-06-17 00:39:00 +02:00 |
|
Franck Allimant
|
c87c6e2793
|
Added free product coupon.
|
2014-06-17 00:38:18 +02:00 |
|
Franck Allimant
|
749487e967
|
Added getDeliveryCountry() method
|
2014-06-17 00:37:53 +02:00 |
|
Franck Allimant
|
e3dc87dd6a
|
Updated translations after finishing coupons
|
2014-06-17 00:37:06 +02:00 |
|
Franck Allimant
|
f3ccf8ec15
|
Updated translation after finishing coupons
|
2014-06-17 00:36:23 +02:00 |
|
Franck Allimant
|
17ad1ed6fa
|
The CouponManager clear() method is now invoked.
|
2014-06-17 00:35:52 +02:00 |
|
Franck Allimant
|
6b6687c85c
|
Added clear() method
|
2014-06-17 00:35:12 +02:00 |
|
Franck Allimant
|
2edfb0b389
|
Added clear method.
|
2014-06-17 00:34:57 +02:00 |
|
Manuel Raynaud
|
7377af6029
|
Merge pull request #471 from nicolasleon/master
Date formating should be able to cope with locale time format
|
2014-06-15 19:47:22 +02:00 |
|
Nicolas Léon
|
20593a0576
|
Fix PSR coding style
|
2014-06-14 21:58:33 +02:00 |
|
Franck Allimant
|
ee47488cc8
|
getDefaultSaleElements() returns a single ProductSaleElement
|
2014-06-14 17:45:05 +02:00 |
|
Franck Allimant
|
ae6eaefd25
|
Fixed @param and @return annotations
|
2014-06-14 16:10:52 +02:00 |
|
Manuel Raynaud
|
c43e77e766
|
Merge pull request #475 from stephaniepinet/order_modification
Order invoice new button label
|
2014-06-13 16:01:03 +02:00 |
|
stephaniepinet
|
7d92398863
|
Order invoice new button label
|
2014-06-13 15:36:48 +02:00 |
|
Nicolas Léon
|
7c653d63a6
|
Save and restore the current locale setting
|
2014-06-13 09:54:38 +02:00 |
|
Manuel Raynaud
|
0203a14674
|
Merge pull request #474 from alexian530/alexian530-branch
Update product link in backoffice/order-edit
|
2014-06-13 09:17:28 +02:00 |
|
alexian dugour
|
7bf2d8ec58
|
Mise à jours lien fiche produit sur template order-edit dans le back-office
|
2014-06-13 08:57:28 +02:00 |
|
Franck Allimant
|
ec26ebac32
|
php-cs fixer passed.
|
2014-06-12 17:10:38 +02:00 |
|
Franck Allimant
|
e9a0661938
|
Pushed forward the refactoring, using traits
|
2014-06-12 17:00:17 +02:00 |
|
Franck Allimant
|
b34f1c35c7
|
Fixed the checking of maximum coupon usage count
|
2014-06-12 16:42:00 +02:00 |
|
Franck Allimant
|
992100f145
|
Added helper to chek if number of uses is reached
|
2014-06-12 16:40:07 +02:00 |
|
Franck Allimant
|
96ebcf1880
|
Added the COUPON_CLEAR_ALL event, and a route to trigger it.
|
2014-06-12 16:39:27 +02:00 |
|
Franck Allimant
|
95841809c4
|
Refactored coupons to reduce code duplication
|
2014-06-12 13:14:46 +02:00 |
|
Franck Allimant
|
db29505fee
|
Added Attribute value related coupons
|
2014-06-12 13:14:07 +02:00 |
|
Franck Allimant
|
147d4a70f1
|
Improved coupon UI
|
2014-06-12 12:12:31 +02:00 |
|
Manuel Raynaud
|
9783b251c2
|
remove url test
|
2014-06-12 10:04:33 +02:00 |
|
Manuel Raynaud
|
21f83e444c
|
Merge pull request #470 from lunika/install
don't try to change permission on file during install process
|
2014-06-11 18:25:18 +02:00 |
|
Nicolas Léon
|
f33c50fdd3
|
Typo fix
|
2014-06-11 17:55:14 +02:00 |
|
Nicolas Léon
|
8126c8e1b0
|
Allow localization of date formating
|
2014-06-11 17:53:19 +02:00 |
|
Manuel Raynaud
|
2ddc0fb6a3
|
fix cs
|
2014-06-11 17:14:13 +02:00 |
|
Manuel Raynaud
|
863f7a479a
|
don't try to change permission on file during install process
|
2014-06-11 16:52:21 +02:00 |
|
Manuel Raynaud
|
2a795945a4
|
Merge pull request #463 from lunika/2.0.2
prepare release 2.0.2
|
2014-06-11 16:24:43 +02:00 |
|
Manuel Raynaud
|
5edeee6996
|
fix cs
|
2014-06-11 16:09:44 +02:00 |
|
Manuel Raynaud
|
3434010b54
|
prepare release 2.0.2
|
2014-06-11 16:05:08 +02:00 |
|
Manuel Raynaud
|
733794c312
|
Merge pull request #469 from lunika/breadcrumb
manage breadcrumb on images and documents
|
2014-06-11 16:04:19 +02:00 |
|