Marion Muszynski
91af2d4455
addition of manual updating of loyalty orders
2016-09-14 12:17:23 +02:00
Rodney Figaro
5baa5eaf9a
fix : get best sale of the same sale family with label in front
2016-09-13 10:48:36 +02:00
Rodney Figaro
ebb136206a
remove unused code
2016-09-13 09:34:18 +02:00
Rodney Figaro
bdd6aadc71
show best sales of same sale family rather than the same category
2016-09-12 18:08:28 +02:00
Rodney Figaro
48daa71f67
fix db fields requested by one method in productsale, fix arguments in methods in module
2016-09-12 12:12:05 +02:00
Rodney Figaro
81d4be3108
fixes and cleanup
2016-09-12 11:59:22 +02:00
Marion Muszynski
649ff79d13
Merge branch 'evo-savePaypal' into develop
2016-09-09 17:19:45 +02:00
Marion Muszynski
1e7243c023
checking orders addition
2016-09-09 17:19:12 +02:00
Marion Muszynski
bd166ff884
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 12:19:25 +02:00
Marion Muszynski
23c4e93fe8
addition of double checking on valid order
2016-09-09 12:18:58 +02:00
Marion Muszynski
008e27ac4e
Merge branch 'evo-savePaypal' into develop
2016-09-08 18:10:03 +02:00
Marion Muszynski
e9ea05d32b
addition of delivery address checking
2016-09-08 18:08:21 +02:00
Marion Muszynski
3e8ec797fb
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 17:51:37 +02:00
Marion Muszynski
a5a5278eb8
fix request
2016-09-08 17:51:04 +02:00
Marion Muszynski
9ed80d89ab
addition of delivery address checking
2016-09-08 17:48:51 +02:00
Marion Muszynski
d1be85cca4
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 17:07:55 +02:00
Marion Muszynski
c004322a41
addition of url redirect
2016-09-08 17:07:17 +02:00
Marion Muszynski
e5aecd0e46
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 16:47:54 +02:00
Marion Muszynski
89b3fc48bb
small fix
2016-09-08 16:47:36 +02:00
Marion Muszynski
6ff5ea4d4d
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 16:32:57 +02:00
Marion Muszynski
3ad121eedb
process success addition
2016-09-08 16:32:14 +02:00
Marion Muszynski
3d3adaa160
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 14:51:23 +02:00
Marion Muszynski
564c008cf6
more mailing addition
2016-09-08 14:51:03 +02:00
Marion Muszynski
5386bfe970
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 14:37:05 +02:00
Marion Muszynski
251b0eac53
addition of mailing for test
2016-09-08 14:36:31 +02:00
Rodney Figaro
9ecf2491c6
add module 'privatesales_similarproduct'
...
In product detail page :
- show slider with product associated accessories if any, above the best selling products slider
- show product's family best selling instead of the accessories, if any
- show no slider if no accessories nor family best selling present
Cache slider templates for :
- associated accessories for each product for every language, if any
- family best selling for each family of the product for every language, if any
Fixes in javascript :
- missing globals variables in module expresscart would the express cart fail when out of stock
- change the express cart displaying when clicking on the cart icon in any footer sliders.
Css :
duplicate all css styles 'best-sellers_block_product' in 'privatesales_similarproduct' so that the latter slider can be adapted if required.
2016-09-08 13:04:14 +02:00
Marion Muszynski
5c755acd4b
Merge branch 'ticket-philea'
2016-09-08 12:41:24 +02:00
Marion Muszynski
50cc5511ac
fix about phone number
2016-09-08 12:40:32 +02:00
Marion Muszynski
847e13178e
Merge branch 'evo-DBorderCurrentState' into develop
2016-09-08 11:53:06 +02:00
Marion Muszynski
1edec769dd
Merge branch 'ticket-philea'
2016-09-07 17:42:43 +02:00
Marion Muszynski
d839706175
modif code article
2016-09-07 17:42:06 +02:00
Marion Muszynski
7c3fbc75dd
Merge branch 'ticket-philea'
2016-09-07 16:17:36 +02:00
Marion Muszynski
a6fc45e479
adjust send_commande
2016-09-07 16:17:03 +02:00
Marion Muszynski
68fe001982
Merge branch 'ticket-philea'
2016-09-07 15:11:01 +02:00
Marion Muszynski
df7b6dbc05
small fix
2016-09-07 15:10:28 +02:00
Marion Muszynski
f8da29a7e2
fix conflict about vi editor
2016-09-07 15:06:41 +02:00
Marion Muszynski
88b3c10898
fix
2016-09-07 15:03:58 +02:00
Marion Muszynski
66544cc598
Merge branch 'ticket-10296'
2016-09-07 14:45:15 +02:00
Marion Muszynski
b376875be8
modif wordwrap
2016-09-07 14:44:40 +02:00
Marion Muszynski
a7198f0fea
Merge branch 'ticket-philea'
2016-09-07 12:29:37 +02:00
Marion Muszynski
c5cfa64cc2
Merge branch 'ticket-philea' into develop
2016-09-07 12:05:14 +02:00
Marion Muszynski
0c118717af
small addition
2016-09-07 12:03:31 +02:00
Marion Muszynski
72eadd62bd
Merge branch 'ticket-philea' into develop
2016-09-07 11:43:17 +02:00
Marion Muszynski
f790336c29
big modif
2016-09-07 11:42:38 +02:00
Marion Muszynski
266e966b2f
Merge branch 'ticket-10296'
2016-09-07 09:03:09 +02:00
Marion Muszynski
40457d1935
Merge branch 'ticket-10296' into develop
2016-09-07 08:58:24 +02:00
Marion Muszynski
b093c60edb
small fix to cast id_lang
2016-09-07 08:57:28 +02:00
Marion Muszynski
a6be8282c0
Merge branch 'ticket-philea' into develop
2016-09-06 18:06:26 +02:00
Marion Muszynski
3caeacffae
modif send_article according bbb account
2016-09-06 18:05:54 +02:00
Marion Muszynski
542fe9c0b4
Merge branch 'ticket-philea' into develop
2016-09-06 16:48:57 +02:00
Marion Muszynski
01c77b3901
modif send_commande according bbb settings
2016-09-06 16:48:13 +02:00
Marion Muszynski
cff89e4704
Merge branch 'ticket-philea' into develop
2016-09-06 15:42:28 +02:00
Marion Muszynski
36180ad403
add remote address and http host in send_article
2016-09-06 15:41:34 +02:00
Marion Muszynski
1e751507ab
Merge branch 'ticket-philea' into develop
2016-09-06 15:34:55 +02:00
Marion Muszynski
1df6036d99
addition of philea module and helper class for admin
2016-09-06 15:32:52 +02:00
Marion Muszynski
7c4ee5abad
Merge branch 'evo-removeThumbVP' into develop
2016-09-06 11:08:04 +02:00
Marion Muszynski
b4ff3a8ee5
addition of remove img option in adminPrivateSalesSales
2016-09-06 11:07:40 +02:00
Marion Muszynski
2d10e1b167
Merge branch 'ticket-9260'
2016-09-05 16:52:19 +02:00
Marion Muszynski
b6dc54c290
addition html2text for emarsys and vp description
2016-09-05 15:45:05 +02:00
Marion Muszynski
6f357a68ab
Merge branch 'ticket-9260' into develop
2016-09-05 11:58:03 +02:00
Marion Muszynski
17eda01760
modif for children cat
2016-09-05 11:57:43 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
90a847db2b
Merge branch 'fix-ticket-10169' into develop
2016-09-01 11:18:03 +02:00
Marion Muszynski
31bb7e145b
fix form reprint
2016-09-01 11:17:43 +02:00
Marion Muszynski
8e309f060f
Merge branch 'ticket-10169'
2016-08-31 16:26:35 +02:00
Marion Muszynski
51f7b39a4d
Merge branch 'ticket-10169' into develop
2016-08-31 16:26:10 +02:00
Marion Muszynski
ad26e64ad0
fix weight
2016-08-31 16:25:49 +02:00
Marion Muszynski
639b7111e6
Merge branch 'ticket-10169'
2016-08-31 15:58:44 +02:00
Marion Muszynski
c12d1535ff
Merge branch 'ticket-10169' into develop
2016-08-31 15:22:54 +02:00
Marion Muszynski
1fdec1c945
Merge branch 'ticket-9260' into develop
2016-08-31 12:41:31 +02:00
Marion Muszynski
0c7aefe613
fix to get sub cat thumb
2016-08-31 12:41:07 +02:00
Marion Muszynski
39534bff4b
Merge branch 'ticket-9260' into develop
2016-08-30 14:03:42 +02:00
Marion Muszynski
719f438b41
fix
2016-08-30 14:03:19 +02:00
Marion Muszynski
563b9059de
Merge branch 'ticket-9260' into develop
2016-08-30 13:56:13 +02:00
Marion Muszynski
0dde6b5611
fix for old sales
2016-08-30 13:55:47 +02:00
Marion Muszynski
e2c867f5ed
Merge branch 'ticket-9260' into develop
2016-08-30 13:48:00 +02:00
Marion Muszynski
a96b0018c0
upload vp miniature in adminCategory
2016-08-30 13:47:42 +02:00
Marion Muszynski
46d2f45100
Merge branch 'ticket-10758' into develop
2016-08-30 10:54:32 +02:00
Marion Muszynski
ba0ad41bd5
ini set memory limit to 1G
2016-08-30 10:54:07 +02:00
Marion Muszynski
b9ff9ead70
fix to loop the correct product array
2016-08-26 16:37:19 +02:00
Marion Muszynski
064072bfb8
modification to reprint label with multi products
2016-08-26 16:35:02 +02:00
Marion Muszynski
9e2007dfe8
adding re print label option
2016-08-26 12:00:54 +02:00
Marion Muszynski
1ed3c9df79
Merge branch 'ticket-9599'
2016-08-25 17:18:51 +02:00
Marion Muszynski
78bc31c542
Merge branch 'ticket-9599' into develop
2016-08-25 17:02:31 +02:00
Marion Muszynski
fdc8a91a61
suite
2016-08-25 16:59:26 +02:00
Rodney Figaro
6ec43fe75d
move the cron task to another dedicated file
2016-08-25 16:12:13 +02:00
Rodney Figaro
4ca5bc73a9
fix cron script
2016-08-25 15:20:38 +02:00
Rodney Figaro
7f18d590a0
add in private sales cron a sales promotional sentence update task
...
the "jusqu'à N%" of a sale promotional field is updated with
the maximum reduction percentage found for every product in the sale.
The cron affect only sales that begin the day when the cron is executed after midnight.
2016-08-25 15:16:44 +02:00
Marion Muszynski
d251c3f8d6
Merge branch 'ticket-9728' into develop
2016-08-25 13:01:37 +02:00
Marion Muszynski
ed4df2bd73
continuing
2016-08-25 12:14:34 +02:00
Marion Muszynski
01ad5eb084
small fix
2016-08-24 17:48:50 +02:00
Rodney Figaro
33c5572c08
apply the same confirmation order page to all type of paypal paiements
2016-08-24 17:24:41 +02:00
Marion Muszynski
ce0e4e89b4
start ticket
2016-08-23 18:05:47 +02:00
Marion Muszynski
41845cd98d
Merge branch 'ticket-8039'
2016-08-23 11:12:04 +02:00
Marion Muszynski
2a82114fa9
fix conflict
2016-08-22 17:10:12 +02:00
root
880d16d5b0
updateprod
2016-08-18 15:56:46 +02:00
Marion Muszynski
78c68346c6
Merge branch 'ticket-modifNameCarrierEs' into develop
2016-07-29 13:42:16 +02:00
Marion Muszynski
39fa6390f7
modif name in order summary
2016-07-29 13:41:55 +02:00
Marion Muszynski
0904afd11c
Merge branch 'ticket-criteo'
2016-07-28 13:36:06 +02:00
Marion Muszynski
8c01db6073
Merge branch 'ticket-criteo' into develop
2016-07-28 13:35:41 +02:00
Marion Muszynski
854d8fe6f0
fix price
2016-07-28 13:35:24 +02:00
Marion Muszynski
141dbfda94
Merge branch 'ticket-criteo'
2016-07-28 13:27:45 +02:00
Marion Muszynski
14640d4601
Merge branch 'ticket-criteo' into develop
2016-07-28 13:27:19 +02:00
Marion Muszynski
2fe135dbce
little mod
2016-07-28 13:26:58 +02:00
Marion Muszynski
794c5e7844
Merge branch 'ticket-criteo'
2016-07-28 12:31:10 +02:00
Marion Muszynski
fe85712667
Merge branch 'ticket-criteo' into develop
2016-07-28 12:30:04 +02:00
Marion Muszynski
285c610784
fix order
2016-07-28 12:29:45 +02:00
Marion Muszynski
08ab57a1f1
Merge branch 'ticket-criteo'
2016-07-28 12:12:10 +02:00
Marion Muszynski
4b20be7481
Merge branch 'ticket-criteo' into develop
2016-07-28 12:06:42 +02:00
Marion Muszynski
de5ea0a04a
fix price quantity
2016-07-28 12:06:25 +02:00
Marion Muszynski
d9c89a94cc
Merge branch 'ticket-criteo'
2016-07-28 11:54:34 +02:00
Marion Muszynski
d7f16471db
Merge branch 'ticket-criteo' into develop
2016-07-28 11:53:32 +02:00
Marion Muszynski
7985bf0b78
small fix
2016-07-28 11:53:17 +02:00
Marion Muszynski
8993c8e126
Merge branch 'ticket-criteo' into develop
2016-07-28 11:49:12 +02:00
Marion Muszynski
6ed911b9d5
fix
2016-07-28 11:48:51 +02:00
Marion Muszynski
08d7951206
Merge branch 'ticket-criteo' into develop
2016-07-28 11:38:28 +02:00
Marion Muszynski
01cc230757
test for fix
2016-07-28 11:38:11 +02:00
Marion Muszynski
b0cce26e9f
Merge branch 'ticket-criteo'
2016-07-28 10:51:01 +02:00
Marion Muszynski
606e4ef980
Merge branch 'ticket-criteo' into develop
2016-07-28 10:50:31 +02:00
Marion Muszynski
25075ae187
small modif
2016-07-28 10:50:05 +02:00
Marion Muszynski
cc08a0f084
Merge branch 'ticket-criteo'
2016-07-27 20:33:12 +02:00
Marion Muszynski
da4ba93d2f
Merge branch 'ticket-criteo' into develop
2016-07-27 20:32:46 +02:00
Marion Muszynski
bf18b4925e
fix
2016-07-27 20:32:27 +02:00
Marion Muszynski
5097cb50ad
Merge branch 'ticket-criteo'
2016-07-27 20:25:55 +02:00
Marion Muszynski
e0ceaff8b9
Merge branch 'ticket-criteo' into develop
2016-07-27 20:25:24 +02:00
Marion Muszynski
5c90af9bee
little fix
2016-07-27 20:25:04 +02:00
Marion Muszynski
9f2d22164b
Merge branch 'ticket-criteo'
2016-07-27 20:15:06 +02:00
Marion Muszynski
01417c4859
Merge branch 'ticket-criteo' into develop
2016-07-27 20:10:46 +02:00
Marion Muszynski
b481e60b11
fix site version
2016-07-27 20:10:25 +02:00
Marion Muszynski
a6532f7848
Merge branch 'ticket-criteo' into develop
2016-07-27 19:52:52 +02:00
Marion Muszynski
0571982b45
ajust js tag
2016-07-27 19:52:24 +02:00
Marion Muszynski
dea3180ba6
Merge branch 'ticket-criteo'
2016-07-27 19:33:17 +02:00
Marion Muszynski
269e97a295
Merge branch 'ticket-criteo' into develop
2016-07-27 19:32:38 +02:00
Marion Muszynski
dd941581b7
fix url
2016-07-27 19:32:15 +02:00
Marion Muszynski
36352f9187
Merge branch 'ticket-criteo'
2016-07-27 19:29:58 +02:00
Marion Muszynski
aa81282b02
Merge branch 'ticket-criteo' into develop
2016-07-27 19:29:32 +02:00
Marion Muszynski
c7f9b261c3
modif url in cron
2016-07-27 19:29:09 +02:00
Marion Muszynski
0c40f60da5
Merge branch 'ticket-payboxAgreement' into develop
2016-07-27 19:17:40 +02:00
Marion Muszynski
c678be4b21
small fix
2016-07-27 18:56:17 +02:00
Marion Muszynski
94ac58ae4b
Merge branch 'ticket-criteo'
2016-07-27 17:50:16 +02:00
Marion Muszynski
53c3eb2a12
Merge branch 'ticket-criteo' into develop
2016-07-27 17:49:56 +02:00
Marion Muszynski
9fabb9b7af
fix
2016-07-27 17:49:29 +02:00
Marion Muszynski
32d3923948
Merge branch 'ticket-criteo'
2016-07-27 17:47:48 +02:00
Marion Muszynski
c21b4b906c
Merge branch 'ticket-criteo' into develop
2016-07-27 17:46:04 +02:00
Marion Muszynski
d2452448fc
fix label in config module
2016-07-27 17:45:44 +02:00
Marion Muszynski
2210cf508e
Merge branch 'ticket-criteo' into develop
2016-07-27 17:43:09 +02:00
Marion Muszynski
fbd9dafcac
modif url product
2016-07-27 17:42:44 +02:00
Marion Muszynski
69731d8590
Merge branch 'ticket-criteo'
2016-07-27 17:06:02 +02:00
Marion Muszynski
492f14f02c
Merge remote-tracking branch 'origin/ticket-blockOrderSummary'
2016-07-27 16:35:50 +02:00
Marion Muszynski
90b790bcab
Merge branch 'ticket-criteo' into develop
2016-07-25 16:40:58 +02:00
