TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,140 Commits 1 Branch 0 Tags
b4eb12f12a2010055366fcf152cf74e286b8709e
Commit Graph

4140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Perche
b4eb12f12a Fix method that prevents orders to be set as Paid in the BO 
modifié:         core/lib/Thelia/Model/Order.php
 2014-07-29 11:34:57 +02:00
Julien
6963754d62 Merge pull request #545 from Yochima/yochima-branch 
Use now the dispatcher to delete feature_product when we change the temp...
fixed : elseloop executed even if loop is empty
 2014-07-28 11:42:53 +02:00
Julien
efd1d871fd Merge pull request #549 from roadster31/update-fix 
Added missing coupon_customer_count table to the 2.0.3.sql update file
 2014-07-25 16:46:59 +02:00
Julien
e4e36efb4d Merge pull request #547 from alexian530/alexian530-branch 
Add pagination to customer-edit
 2014-07-25 16:43:13 +02:00
Guillaume Barral
86b3d12e99 Merge branch 'yochima-branch' of https://github.com/yochima/thelia into yochima-branch 2014-07-25 16:16:19 +02:00
Guillaume Barral
a0b78502d6 Block the smarty interpretation in the elseloop 2014-07-25 16:14:14 +02:00
Guillaume Barral
1b2cbe6746 Respect of the good standards 2014-07-25 16:14:14 +02:00
Guillaume Barral
fdb68d6b95 Use now the dispatcher to delete feature_product when we change the template of a product 2014-07-25 16:14:14 +02:00
Guillaume Barral
d63932fcbd Block the smarty interpretation in the elseloop 2014-07-25 16:10:09 +02:00
Guillaume Barral
cea6491d77 Respect of the good standards 2014-07-25 10:33:52 +02:00
Franck Allimant
79b0e20523 Added missing coupon_customer_count table 2014-07-24 16:26:30 +02:00
alexian dugour
91161ab695 Add pagination to customer-edit 
modified:   templates/backOffice/default/customer-edit.html
 2014-07-24 12:47:27 +02:00
Julien
c97cb78709 Merge pull request #546 from roadster31/couponfix 
Added missing columns to coupon_version table in 2.0.3.sql update file
 2014-07-24 09:42:22 +02:00
Franck Allimant
a3c8fee6e0 Added missing columns to coupon_version table 2014-07-24 09:10:35 +02:00
Guillaume Barral
daf451f7b8 Use now the dispatcher to delete feature_product when we change the template of a product 2014-07-23 16:08:19 +02:00
Julien
2c6b36f7c7 Merge pull request #543 from roadster31/sales 
in_use parameter added to the coupon loop
 2014-07-23 14:11:46 +02:00
Franck Allimant
2268180786 Removed unused variable 2014-07-22 19:43:39 +02:00
Franck Allimant
94257eeb86 The request object is \Thelia\Core\HttpFoundation\Request 2014-07-22 19:01:18 +02:00
Franck Allimant
bfd9a6ac7d Added isInUse() method to the CouponInterface 2014-07-22 18:59:58 +02:00
Franck Allimant
bc57c879c0 Added in_use parameter to the loop 2014-07-22 18:59:19 +02:00
Franck Allimant
6273179986 Added a default value for getConsumedCoupons() 2014-07-22 18:58:55 +02:00
Franck Allimant
b74d5d9a34 Added ID in language list. 2014-07-22 16:31:16 +02:00
Julien
77e6635a04 Merge pull request #537 from jodeq/master 
Add missing french translation for config_i18n
 2014-07-21 09:29:12 +02:00
Julien
7d7dab53ec Merge pull request #536 from Alban-io/patch-1 
fix redirect current_tab in product edit page
 2014-07-21 08:53:32 +02:00
jodeq
c027bd2f57 With the change of page configuration/variables which display title message of variables, here the French translations to insert when creating a new shop. 
2.0.3 update script is also modified.
 2014-07-18 16:22:10 +02:00
Alban Baixas
8d109ed34c fix redirect current_tab 2014-07-18 12:35:39 +02:00
Julien
e81a4a3a88 Merge pull request #532 from bibich/improvements 
small corrections and improvements, especially on the backoffice template.
 2014-07-16 20:33:24 +02:00
Julien Chanséaume
800a1c3f5d Added product reference in the title of the product edit page 2014-07-16 18:39:11 +02:00
Julien Chanséaume
1d541c0dc2 Fixed issue on sort order on catalog page. Added price in the product list 2014-07-16 18:39:10 +02:00
Julien Chanséaume
a1c1f1fb0e Fixed URL::absoluteUrl when an URL contains a target and parameters is not empty 2014-07-16 18:39:10 +02:00
Julien Chanséaume
e9bfe42070 fixed sql update script for brands 2014-07-16 18:39:10 +02:00
Julien Chanséaume
bb029cdf35 Fixed the display of the free text value for a feature 2014-07-16 18:39:10 +02:00
Julien Chanséaume
9900acef84 added ATTRIBUTE_ID and ATTRIBUTE_AVAILABILITY_ID to attribute_combination loop 2014-07-16 18:39:10 +02:00
Julien Chanséaume
3745de8f57 fixed position tests on brands 2014-07-16 18:39:10 +02:00
Julien Chanséaume
0a99b29015 added toolbar 2014-07-16 18:39:10 +02:00
Julien Chanséaume
12e84afdf8 Fixed wrong calculated price when comma is used instead of dot. 2014-07-16 18:39:10 +02:00
Julien Chanséaume
0310dce719 Revert "Fixed wrong calculated price when comma is used instead of dot." 
This reverts commit 1a3542ada2dd63f59adeafc0d1f434057d5da927.
 2014-07-16 18:39:10 +02:00
Julien Chanséaume
97559fe8c2 Fixed wrong calculated price when comma is used instead of dot. 2014-07-16 18:39:10 +02:00
Julien Chanséaume
a72b6e5ca7 Added direct link to the customer page on order detail. 2014-07-16 18:39:09 +02:00
Julien Chanséaume
43517c629a Fixed order edit. When a product was deleted, the title was blank. Now we use the order_product title. 2014-07-16 18:39:09 +02:00
Julien Chanséaume
4aec6f4b3d Fixed method to display options in the current local and not en_US. 2014-07-16 18:39:09 +02:00
Julien
1e0bb03804 Merge pull request #531 from lovenunu/firewall 
Add firewall security on forms
 2014-07-16 18:33:56 +02:00
Benjamin Perche
a5a8f1993a Add changelog 
modifié:         CHANGELOG.md
 2014-07-16 15:47:55 +02:00
Benjamin Perche
47e2198936 Remove useless variable 
modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 15:41:28 +02:00
Benjamin Perche
59bab34513 Add auto delete to keep the table small 
modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 15:28:10 +02:00
Benjamin Perche
dd00af72cb Fix cs 
modifié:         core/lib/Thelia/Form/BruteforceForm.php
	modifié:         core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 14:59:38 +02:00
Benjamin Perche
660624f609 Add tests 
nouveau fichier: core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 14:58:18 +02:00
Benjamin Perche
6208b12942 Fix waiting time text 
modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 14:57:46 +02:00
Benjamin Perche
28e027bca4 Change firewall time from hours to minutes 
nouveau fichier: core/lib/Thelia/Form/BruteforceForm.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 14:22:32 +02:00
Benjamin Perche
b424fb2750 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
 2014-07-16 11:09:35 +02:00