Guillaume Barral
eb895bc544
Add pagination to the product list (backOffice)
2014-06-03 12:35:52 +02:00
Manuel Raynaud
6137fb8893
Merge pull request #446 from lunika/issues
...
Issues
2014-05-30 17:33:07 +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
08ec1140aa
show active menu tab. Fix #262
2014-05-30 11:26:32 +02:00
Manuel Raynaud
c738361221
Merge pull request #445 from zzuutt/master
...
Correction issue #425
2014-05-28 23:42:21 +02:00
Manuel Raynaud
ee6bb052ad
Merge pull request #439 from roadster31/coupon-types
...
Coupon types
2014-05-28 15:58:01 +02:00
Manuel Raynaud
70ecac55cc
Merge pull request #436 from etienneroudeix/master
...
add Hong Kong to country list
2014-05-28 15:45:15 +02:00
etienne roudeix
507a52a20f
Update 2.0.2.sql
2014-05-28 14:56:46 +02:00
etienne roudeix
5395c76bf3
Update insert.sql
2014-05-28 14:56:04 +02:00
Franck Allimant
567fee839c
Added RemoveAmountOnCategories coupon type
2014-05-28 12:02:56 +02:00
Franck Allimant
23ebb88719
Fix #438
2014-05-28 12:01:46 +02:00
Manuel Raynaud
6567e19164
Merge pull request #437 from lunika/admin
...
reset modified column after admin connection
2014-05-27 17:12:13 +02:00
Manuel Raynaud
087fc6e9bf
reset modified column after admin connection
2014-05-27 17:09:53 +02:00
etienne
88a7164e96
add Hong Kong to country list
2014-05-27 15:38:11 +02:00
Manuel Raynaud
99fb562660
Merge pull request #435 from Yochima/yochima-branch
...
add argument id to the order_product loop
2014-05-27 08:53:19 +02:00
Guillaume Barral
2587f208c6
add argument id to the order_product loop
2014-05-27 08:44:49 +02:00
Manuel Raynaud
30f7eec494
Merge pull request #433 from lunika/asset
...
don't catch exception when javscript assets are processed
2014-05-26 17:01:43 +02:00
Manuel Raynaud
6eaea72043
don't catch exception when javscript assets are processed
2014-05-26 11:07:02 +02:00
Manuel Raynaud
f9ec2b39b0
Merge pull request #431 from knjeurope/master
...
Add code source insert
2014-05-26 09:16:36 +02:00
knjeurope
58b33a8e05
Add code source insert
...
Add cose source insert with TinyMce
2014-05-26 08:36:42 +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
zzuutt
f8cf0b5692
Correction issue #425
...
le test du status n'etait pas correct
ajout des logs
2014-05-22 11:06:43 +02:00
Manuel Raynaud
8464a8e861
Merge pull request #420 from lunika/session
...
Session
2014-05-20 11:36:55 +02:00
Manuel Raynaud
84e28f1ff2
update changelog with new session process
2014-05-20 11:33:00 +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
b3b16e1fb1
Added vendor block to schema
2014-05-18 20:34:58 +02:00
Franck Allimant
612898d3b3
ENGINE=InnoDB; -> ENGINE=InnoDB CHARACTER SET='utf8';
2014-05-18 20:30:14 +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
Manuel Raynaud
7ef09069cb
Merge pull request #414 from nicolasleon/master
...
Allow Content Loop to be ordered by created_at date
2014-05-18 19:38:16 +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
f772a49dcc
Added Windows version of php-cs script
2014-05-17 11:59:53 +02:00
Franck Allimant
a3e1ece3dc
Merge branch 'coupon-types' of https://github.com/roadster31/thelia into coupon-types
2014-05-17 10:58:00 +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
