Michael RICOIS
|
f15d094753
|
Display image
|
2017-11-08 09:49:09 +01:00 |
|
Michael RICOIS
|
9963cbee23
|
Spaces
|
2017-11-08 09:48:45 +01:00 |
|
Michael RICOIS
|
731d431be1
|
New rewrite rules
|
2017-11-08 09:48:29 +01:00 |
|
Michael RICOIS
|
75c8fe9e6f
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-07 12:33:38 +01:00 |
|
Michael RICOIS
|
60e3da5380
|
Traduction
|
2017-11-07 12:33:03 +01:00 |
|
Michael RICOIS
|
6c09de8b18
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-07 12:18:12 +01:00 |
|
Michael RICOIS
|
c2c55f1302
|
Merge remote-tracking branch 'origin/ticket-14525-parrain' into develop
|
2017-11-07 12:18:00 +01:00 |
|
Michael RICOIS
|
7dfa4d7cbe
|
Remove replacement
|
2017-11-07 12:17:20 +01:00 |
|
Michael RICOIS
|
3cf9de8772
|
Integrate on front
|
2017-11-07 11:51:19 +01:00 |
|
Marion Muszynski
|
284d7fc187
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:44:10 +01:00 |
|
Marion Muszynski
|
b67c3f7300
|
fixe comma
|
2017-11-06 17:44:02 +01:00 |
|
Marion Muszynski
|
7d06b3c212
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:41:16 +01:00 |
|
Marion Muszynski
|
62485e0888
|
fix date format
|
2017-11-06 17:41:05 +01:00 |
|
Marion Muszynski
|
7b61800173
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:37:05 +01:00 |
|
Marion Muszynski
|
d782b3e157
|
fix format and more
|
2017-11-06 17:36:53 +01:00 |
|
Marion Muszynski
|
9c4b8164e3
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 16:52:06 +01:00 |
|
Marion Muszynski
|
6a95069481
|
search in attributes
|
2017-11-06 16:51:48 +01:00 |
|
Michael RICOIS
|
3eab7df2ef
|
Front integration
|
2017-11-06 10:26:53 +01:00 |
|
Michael RICOIS
|
cc35d92d83
|
Delete
|
2017-11-03 10:51:26 +01:00 |
|
Michael RICOIS
|
2eb955f6d2
|
Change tpl path
|
2017-11-03 10:49:38 +01:00 |
|
Michael RICOIS
|
8269e1b38a
|
Protect directory
|
2017-11-03 10:49:03 +01:00 |
|
Michael RICOIS
|
6adcecc54b
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-03 10:29:59 +01:00 |
|
Michael RICOIS
|
b2f2a0309e
|
Merge branch 'ticket-14139-delivery-poste'
|
2017-11-03 10:16:19 +01:00 |
|
Michael RICOIS
|
d777e89f81
|
Enhance module
|
2017-11-03 10:14:28 +01:00 |
|
Michael RICOIS
|
f6b3425af3
|
Remove notice
|
2017-10-31 17:37:49 +01:00 |
|
Michael RICOIS
|
bee38c462b
|
Add condition following number of orders
|
2017-10-31 16:45:07 +01:00 |
|
Marion Muszynski
|
ead1bf052e
|
Merge branch 'Task-Caching_2' into develop
|
2017-10-31 16:04:53 +01:00 |
|
Marion Muszynski
|
d0c298f20b
|
caching menu
|
2017-10-31 16:04:36 +01:00 |
|
Michael RICOIS
|
12086ed19b
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-31 14:59:44 +01:00 |
|
Michael RICOIS
|
eed1052304
|
Email translation
|
2017-10-31 14:58:54 +01:00 |
|
Marion Muszynski
|
a5e58e2114
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 14:48:43 +01:00 |
|
Marion Muszynski
|
bf636c7617
|
fix skinstatic
|
2017-10-31 14:48:32 +01:00 |
|
Marion Muszynski
|
ef54c025ad
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 13:11:14 +01:00 |
|
Marion Muszynski
|
0a775574f8
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:44:27 +01:00 |
|
Marion Muszynski
|
233559e439
|
fix count nex products
|
2017-10-31 12:44:11 +01:00 |
|
Marion Muszynski
|
e72bdef669
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:41:21 +01:00 |
|
Marion Muszynski
|
d8a4e94113
|
fix filename
|
2017-10-31 12:41:11 +01:00 |
|
Marion Muszynski
|
f0cc764b16
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:32:53 +01:00 |
|
Marion Muszynski
|
caf88c2c7e
|
correction of formulae
|
2017-10-31 12:32:41 +01:00 |
|
Michael RICOIS
|
7bd7624200
|
Add sponsor from backoffice
|
2017-10-31 12:24:29 +01:00 |
|
Marion Muszynski
|
2f20adc1e6
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-30 15:45:42 +01:00 |
|
Marion Muszynski
|
a6ebb26af0
|
fix when product not found
|
2017-10-30 15:45:23 +01:00 |
|
Marion Muszynski
|
cd2bf20ae9
|
uncache sale for backoffice
|
2017-10-30 15:11:20 +01:00 |
|
Marion Muszynski
|
5ea49b53b4
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 14:41:52 +01:00 |
|
Marion Muszynski
|
c25d0551cd
|
remove console log
|
2017-10-30 14:41:37 +01:00 |
|
Marion Muszynski
|
0b78ebc2f3
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 13:42:08 +01:00 |
|
Marion Muszynski
|
07dd8ab9c9
|
test flush cache sale
|
2017-10-30 13:41:50 +01:00 |
|
Marion Muszynski
|
6f3b5615dc
|
Merge branch 'ticket-12868-WhiteBG'
|
2017-10-30 11:35:14 +01:00 |
|
root
|
690a60f4ad
|
fix from prod for payment modules
|
2017-10-30 11:34:13 +01:00 |
|
Marion Muszynski
|
b7830f009e
|
Merge branch 'ticket-14309-fixAlreadyPaid' into develop
|
2017-10-30 10:27:59 +01:00 |
|
Marion Muszynski
|
356a2ab034
|
test if cart is already transformed
|
2017-10-30 10:27:20 +01:00 |
|
Marion Muszynski
|
0f810abd18
|
fix fraud paybox when i is empty
|
2017-10-27 16:19:20 +02:00 |
|
Michael RICOIS
|
4af87fd2ec
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 15:21:23 +02:00 |
|
Michael RICOIS
|
6b15c279b9
|
Date
|
2017-10-27 15:20:43 +02:00 |
|
Michael RICOIS
|
0716c6a878
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-10-27 14:46:59 +02:00 |
|
Michael RICOIS
|
7854985496
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 14:46:36 +02:00 |
|
Michael RICOIS
|
d193722c18
|
Change date calc
|
2017-10-27 14:45:36 +02:00 |
|
Marion Muszynski
|
c3ea5cd75f
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:16:11 +02:00 |
|
Marion Muszynski
|
b6700ea7ce
|
add module
|
2017-10-27 13:16:02 +02:00 |
|
Marion Muszynski
|
aac4da9c0a
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:12:23 +02:00 |
|
Michael RICOIS
|
01a0f65cf3
|
Merge remote-tracking branch 'origin/ticket-14273-voucher' into develop
|
2017-10-26 17:25:50 +02:00 |
|
Michael RICOIS
|
4d2469f275
|
Merge remote-tracking branch 'origin/ticket-14139-delivery-poste' into develop
|
2017-10-26 17:24:09 +02:00 |
|
Michael RICOIS
|
e3c5b8a528
|
Specific with BPR (Point Relais mais Bureau De poste)
|
2017-10-26 17:14:02 +02:00 |
|
Marion Muszynski
|
f64bc5ff1f
|
fix for admin
|
2017-10-25 15:48:01 +02:00 |
|
Marion Muszynski
|
d62919e240
|
uncache future sale
|
2017-10-25 15:37:15 +02:00 |
|
Marion Muszynski
|
35e786058c
|
add mobile off img
|
2017-10-25 15:06:50 +02:00 |
|
Marion Muszynski
|
96a0f240f2
|
Merge branch 'add-CacheRedis'
|
2017-10-25 14:31:25 +02:00 |
|
Marion Muszynski
|
2ea53f44ab
|
Merge branch 'fix-namePromoBanner' into develop
|
2017-10-24 18:30:31 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Marion Muszynski
|
53b8a9d4ee
|
fix conflict
|
2017-10-24 18:26:36 +02:00 |
|
Marion Muszynski
|
20ab1d75d9
|
change to update img promo banner
|
2017-10-24 18:24:17 +02:00 |
|
Marion Muszynski
|
85bb191d49
|
fix
|
2017-10-24 16:44:04 +02:00 |
|
Marion Muszynski
|
824b68b169
|
fix cron trace for order state changement
|
2017-10-24 11:03:33 +02:00 |
|
Marion Muszynski
|
161673618e
|
Merge branch 'fix-resetpassword-include' into develop
|
2017-10-24 10:27:54 +02:00 |
|
Marion Muszynski
|
ef97bdfc53
|
fix required paths
|
2017-10-24 10:27:38 +02:00 |
|
Marion Muszynski
|
0c8837cfbe
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-23 16:18:52 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +02:00 |
|
Michael RICOIS
|
bbc0573e37
|
Add shippinBack info
|
2017-10-23 11:56:43 +02:00 |
|
Marion Muszynski
|
fc08dfd0eb
|
fix delay in admin privatesale
|
2017-10-23 10:10:05 +02:00 |
|
Marion Muszynski
|
7b78add4b8
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 18:11:33 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Michael RICOIS
|
7d2d8f1f03
|
Add a var when shipping is refund
|
2017-10-19 17:53:46 +02:00 |
|
Marion Muszynski
|
5c7c20a708
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:16:13 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Marion Muszynski
|
df52811ada
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:13:41 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Marion Muszynski
|
7d7003353c
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-19 15:40:37 +02:00 |
|
Marion Muszynski
|
430de0c2e4
|
update philea to sync none philea sale after it s ended
|
2017-10-19 15:40:22 +02:00 |
|
root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|
Marion Muszynski
|
5c27461185
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:31:02 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Marion Muszynski
|
35848aba51
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:26:30 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Marion Muszynski
|
33e179bb96
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 13:25:06 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|
Marion Muszynski
|
61865a956c
|
fix style
|
2017-10-04 17:59:51 +02:00 |
|
Marion Muszynski
|
4d5dd0a75d
|
fix front
|
2017-10-04 17:55:35 +02:00 |
|
Marion Muszynski
|
529b36298a
|
refont stat log
|
2017-10-04 16:54:25 +02:00 |
|
Marion Muszynski
|
ab39a55b63
|
change trad
|
2017-10-04 15:36:36 +02:00 |
|
Marion Muszynski
|
2a5b0712e9
|
Merge branch 'update-CreationCat' into develop
|
2017-10-04 13:25:50 +02:00 |
|
Marion Muszynski
|
f7057346be
|
add creation category in adminprivatesalesale
|
2017-10-04 13:25:32 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +02:00 |
|
Michael RICOIS
|
c48408c2db
|
Add new value to detect full refund
|
2017-10-02 17:00:14 +02:00 |
|
Michael RICOIS
|
fe15bbc6cd
|
New voucher after refund
|
2017-10-02 17:00:13 +02:00 |
|
Marion Muszynski
|
97ec6492c6
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-02 13:24:32 +02:00 |
|
Marion Muszynski
|
c5db353391
|
fix sale conbination
|
2017-10-02 13:24:15 +02:00 |
|
Marion Muszynski
|
faff854953
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:50:22 +02:00 |
|
Marion Muszynski
|
6b2e8deea1
|
fix and addition
|
2017-10-02 12:49:45 +02:00 |
|
Marion Muszynski
|
20b2adc944
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:41:38 +02:00 |
|
Marion Muszynski
|
e12e7616d7
|
fix when is same sale
|
2017-10-02 12:41:00 +02:00 |
|
Marion Muszynski
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
Marion Muszynski
|
0462fda92b
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-28 16:50:18 +02:00 |
|
Marion Muszynski
|
4af060a724
|
fix
|
2017-09-28 16:50:03 +02:00 |
|
root
|
115b1b5f61
|
fix cron
|
2017-09-28 16:45:54 +02:00 |
|
Marion Muszynski
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
32ca734375
|
Merge branch 'fix-functions' into develop
|
2017-09-28 10:39:24 +02:00 |
|
Marion Muszynski
|
7b97517690
|
fix extending save function
|
2017-09-28 10:39:08 +02:00 |
|
Marion Muszynski
|
59f5489410
|
Merge branch 'ticket-14301-ErrorApiPaypal' into develop
|
2017-09-27 16:00:24 +02:00 |
|
Marion Muszynski
|
695cd7740c
|
fix direct payment paypal
|
2017-09-27 16:00:08 +02:00 |
|
Marion Muszynski
|
72f4b5f05a
|
fix conflicts
|
2017-09-27 12:04:46 +02:00 |
|
Marion Muszynski
|
1caec538ac
|
fix paypal api errors
|
2017-09-27 12:03:07 +02:00 |
|
Marion Muszynski
|
a1742a806c
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-26 17:54:53 +02:00 |
|
Marion Muszynski
|
d31496b1fd
|
fix sale name
|
2017-09-26 17:54:36 +02:00 |
|
Marion Muszynski
|
8f07cd31c6
|
fix conflicts
|
2017-09-26 17:35:31 +02:00 |
|
Marion Muszynski
|
a7e422af97
|
add mail sendind
|
2017-09-26 17:34:21 +02:00 |
|
Michael RICOIS
|
389c34f82e
|
Merge branch 'ticket-14162-returnwithqty'
|
2017-09-26 15:35:10 +02:00 |
|
Marion Muszynski
|
8fb28292b8
|
add drop shipping
|
2017-09-26 14:53:38 +02:00 |
|
Michael RICOIS
|
d78b6688fa
|
Merge remote-tracking branch 'origin/ticket-14162-returnwithqty' into develop
|
2017-09-25 18:00:36 +02:00 |
|
Michael RICOIS
|
91e7139f34
|
Manage quantity in return form
|
2017-09-25 17:58:47 +02:00 |
|
Marion Muszynski
|
635e984d67
|
Merge branch 'add-CacheRedis' into develop
|
2017-09-25 12:29:11 +02:00 |
|
Marion Muszynski
|
80c6a3db16
|
Merge branch 'task-ImgMobileCategories' into develop
|
2017-09-25 10:59:58 +02:00 |
|
Marion Muszynski
|
801cb2af23
|
add delete function for category mobile image
|
2017-09-25 10:59:34 +02:00 |
|
Marion Muszynski
|
4b985fb501
|
Merge branch 'ticket-13943-ResetBOpassword'
|
2017-09-21 15:40:57 +02:00 |
|
Marion Muszynski
|
b2d1f7bf90
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:37:57 +02:00 |
|
Marion Muszynski
|
2eddfa25b7
|
fix install module
|
2017-09-21 15:37:41 +02:00 |
|
Marion Muszynski
|
2add8ce479
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:28:25 +02:00 |
|
Marion Muszynski
|
31e6272a31
|
add mail for reset password
|
2017-09-21 15:26:55 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Marion Muszynski
|
26ab7a6a5e
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-20 16:44:36 +02:00 |
|
Marion Muszynski
|
da99ec2597
|
fix lang
|
2017-09-20 16:44:15 +02:00 |
|
Michael RICOIS
|
e694616107
|
Merge remote-tracking branch 'origin/ticket-13149'
|
2017-09-19 11:26:32 +02:00 |
|
Michael RICOIS
|
8c1c166572
|
Merge branch 'ticket-13149' into develop
|
2017-09-18 17:45:29 +02:00 |
|
Michael RICOIS
|
f0e00394fa
|
Clean ajax and add parameter to not loop in categoryUpdate hook
|
2017-09-18 17:44:09 +02:00 |
|
Marion Muszynski
|
cf246105b7
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:47:40 +02:00 |
|
Marion Muszynski
|
0f5228f6e8
|
update error mess from add to cart
|
2017-09-18 11:47:26 +02:00 |
|
Marion Muszynski
|
28aea397b5
|
Merge branch 'ticket-14209-AntAlert' into develop
|
2017-09-18 11:15:04 +02:00 |
|
Marion Muszynski
|
7d297ca19b
|
fix AntAlert checking limits
|
2017-09-18 11:14:40 +02:00 |
|
root
|
9c2cce3d0b
|
fix from prod
|
2017-09-18 11:01:28 +02:00 |
|
Marion Muszynski
|
d8c2c369c9
|
reset password
|
2017-09-18 11:00:12 +02:00 |
|
Marion Muszynski
|
3aaf570fdc
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-15 10:09:51 +02:00 |
|
Marion Muszynski
|
deec098272
|
close wanted sale
|
2017-09-15 10:09:15 +02:00 |
|
Marion Muszynski
|
7e9926a502
|
Merge branch 'ticket-14197-ConstantSale' into develop
|
2017-09-13 10:43:41 +02:00 |
|
Marion Muszynski
|
783d5c55e8
|
add exception to best seller query
|
2017-09-13 10:43:23 +02:00 |
|
root
|
91e4537e41
|
fix and trad from prod
|
2017-09-13 10:28:19 +02:00 |
|
Marion Muszynski
|
51d0a8d3a4
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-09-12 12:08:39 +02:00 |
|
Marion Muszynski
|
965eab38e3
|
coloring background in white
|
2017-09-12 12:08:18 +02:00 |
|
Marion Muszynski
|
ed34173096
|
Merge branch 'ticket-14162-DecliInSAV' into develop
|
2017-09-12 11:26:53 +02:00 |
|
Marion Muszynski
|
d1e1c62245
|
fix https on sale export
|
2017-09-07 11:36:48 +02:00 |
|
Marion Muszynski
|
7b72d11da9
|
start of cacheRedis
|
2017-09-07 11:30:57 +02:00 |
|
Marion Muszynski
|
379bec4ab4
|
Merge branch 'task-imgForMobile' into develop
|
2017-09-01 12:00:07 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Marion Muszynski
|
a40c1d6347
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-31 15:26:01 +02:00 |
|
Marion Muszynski
|
a362ab1aaf
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-31 15:25:37 +02:00 |
|
Marion Muszynski
|
76e3fd9334
|
fix philea
|
2017-08-31 15:25:19 +02:00 |
|
Marion Muszynski
|
0fa8432a12
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-31 15:19:35 +02:00 |
|
Marion Muszynski
|
75853ae3e1
|
fix search query for attributes in category scroll
|
2017-08-31 15:19:19 +02:00 |
|
Marion Muszynski
|
b01136e01f
|
reorder by firstname
|
2017-08-31 12:45:37 +02:00 |
|
Marion Muszynski
|
992321abb8
|
changement stat log
|
2017-08-31 10:49:53 +02:00 |
|
Marion Muszynski
|
fe2616ffbb
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-29 09:50:54 +02:00 |
|
Marion Muszynski
|
cee909f10b
|
fix name and id of checkbox
|
2017-08-29 09:50:32 +02:00 |
|
Marion Muszynski
|
dcfd8aa511
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-28 18:09:23 +02:00 |
|
Marion Muszynski
|
9f7da4b63a
|
update filter with all attribute groups of sale
|
2017-08-28 18:08:55 +02:00 |
|
Marion Muszynski
|
4015a120f5
|
Merge branch 'ticket-13973-OrderInWaiting'
|
2017-08-28 15:42:38 +02:00 |
|
Marion Muszynski
|
43dde69003
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-28 15:41:25 +02:00 |
|
Marion Muszynski
|
48288ea952
|
fix query
|
2017-08-28 15:40:55 +02:00 |
|
Marion Muszynski
|
579306aecc
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-28 15:38:06 +02:00 |
|
Marion Muszynski
|
b221e2eaf5
|
order by carrier firstly
|
2017-08-28 15:37:48 +02:00 |
|
Marion Muszynski
|
a76dd668fe
|
addition of resetbopassword module
|
2017-08-28 14:30:30 +02:00 |
|
root
|
b9c24cbdbb
|
fixes and trad from prod
|
2017-08-28 11:00:40 +02:00 |
|
Marion Muszynski
|
1d12895602
|
fill prtmis field for mondial relay dpc
|
2017-08-28 10:04:09 +02:00 |
|
Marion Muszynski
|
e4d69066bc
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding'
|
2017-08-25 15:50:26 +02:00 |
|
Marion Muszynski
|
a73f5cdf8c
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding' into develop
|
2017-08-24 16:10:37 +02:00 |
|
Marion Muszynski
|
eaefb7f8e4
|
printing multi invoices when products from other sale are completely refunded
|
2017-08-24 16:10:22 +02:00 |
|
Marion Muszynski
|
2d25c1470a
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-24 10:57:56 +02:00 |
|
Marion Muszynski
|
3ed2d5a51b
|
update pending orders
|
2017-08-24 10:57:38 +02:00 |
|
Marion Muszynski
|
1713b36f29
|
fix
|
2017-08-23 10:58:54 +02:00 |
|
Marion Muszynski
|
fc2caf3df4
|
fix async ajax for dnd
|
2017-08-23 10:52:28 +02:00 |
|
Marion Muszynski
|
1466d522d1
|
Merge branch 'ticket-13798-ChangeAddressMR' into develop
|
2017-08-22 17:47:29 +02:00 |
|
Marion Muszynski
|
20d20b4183
|
modification of mr relay by chosing position in order bo
|
2017-08-22 17:47:12 +02:00 |
|
Marion Muszynski
|
f5a5600bba
|
formatting error message
|
2017-08-22 16:21:08 +02:00 |
|
Marion Muszynski
|
a7515c2a36
|
return an error when mr not found
|
2017-08-22 16:19:31 +02:00 |
|
Marion Muszynski
|
95211c3b48
|
Merge branch 'ticket-13983-MailInTransitMR' into develop
|
2017-08-22 14:53:55 +02:00 |
|
Marion Muszynski
|
735739a317
|
send in transit mail for mr expe
|
2017-08-22 14:53:40 +02:00 |
|
Marion Muszynski
|
476c681b72
|
fix error of sentence
|
2017-08-22 12:42:08 +02:00 |
|
Marion Muszynski
|
45a83412e6
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:33:24 +02:00 |
|
Marion Muszynski
|
979e3b3733
|
fix grammar error
|
2017-08-22 12:33:13 +02:00 |
|
Marion Muszynski
|
5d065bae7a
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:29:58 +02:00 |
|
Marion Muszynski
|
ff21d90390
|
change information in admin form
|
2017-08-22 12:29:40 +02:00 |
|
Marion Muszynski
|
c0c99bd7e9
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:26:00 +02:00 |
|
Marion Muszynski
|
2a4c9d9716
|
fix update last sent date
|
2017-08-22 12:25:47 +02:00 |
|
Marion Muszynski
|
ae6ef9393c
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:21:55 +02:00 |
|
Marion Muszynski
|
ae50abd4d5
|
fix
|
2017-08-22 12:21:39 +02:00 |
|
Marion Muszynski
|
b283b18d74
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:57:31 +02:00 |
|
Marion Muszynski
|
c3e6114948
|
fix param
|
2017-08-22 11:57:21 +02:00 |
|
Marion Muszynski
|
4befac4029
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:44:08 +02:00 |
|
Marion Muszynski
|
e6830465e0
|
fix
|
2017-08-22 11:43:58 +02:00 |
|
Marion Muszynski
|
2c541bfd6b
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:35:59 +02:00 |
|
Marion Muszynski
|
fb748dbad6
|
add models
|
2017-08-22 11:35:39 +02:00 |
|
Marion Muszynski
|
15a82bf7f0
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:31:13 +02:00 |
|
Marion Muszynski
|
a4853d9043
|
updating Mail alert module
|
2017-08-22 11:30:56 +02:00 |
|
root
|
a56d8c04e8
|
fix from prod
|
2017-08-22 09:59:32 +02:00 |
|
root
|
76dee4cf4c
|
fix from prod
|
2017-08-21 17:57:02 +02:00 |
|
Marion Muszynski
|
8636efc018
|
fix reprint MR for multi parcel
|
2017-08-21 15:05:19 +02:00 |
|
Marion Muszynski
|
5573d5a98d
|
Merge branch 'ticket-13942-fixDeliveryDelay'
|
2017-08-21 12:26:57 +02:00 |
|
root
|
1efe0a509d
|
fix from prod
|
2017-08-21 12:20:02 +02:00 |
|
Marion Muszynski
|
aca897dd80
|
Merge branch 'ticket-13942-fixDeliveryDelay' into develop
|
2017-08-21 12:06:06 +02:00 |
|
Marion Muszynski
|
deebe9e910
|
fix sale delay
|
2017-08-21 12:05:51 +02:00 |
|
Marion Muszynski
|
f36246257c
|
fix conflict
|
2017-08-21 11:46:25 +02:00 |
|
Marion Muszynski
|
0e84b82114
|
remove company name for MR expe
|
2017-08-21 11:44:27 +02:00 |
|
Marion Muszynski
|
851ff949be
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-21 10:46:55 +02:00 |
|
Marion Muszynski
|
89f1f6f102
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 16:09:42 +02:00 |
|
Marion Muszynski
|
1247fc2492
|
fix css
|
2017-08-17 16:09:33 +02:00 |
|
Marion Muszynski
|
a5375c2a3d
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 15:53:22 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Marion Muszynski
|
9806fd20de
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-17 15:26:25 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +02:00 |
|
Marion Muszynski
|
1412696156
|
addition of solution field for supplier demand
|
2017-07-28 12:16:24 +02:00 |
|
Marion Muszynski
|
1b1e303364
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-27 12:07:54 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
Marion Muszynski
|
58b3c509b4
|
prevent multi tracking after registration
|
2017-07-26 13:21:18 +02:00 |
|
Marion Muszynski
|
3525fdc711
|
Merge branch 'ticket-13775-PreventHacking'
|
2017-07-26 11:10:12 +02:00 |
|
Marion Muszynski
|
4acbde0319
|
add module alerthack to prevent hacker to post
|
2017-07-26 11:09:47 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
root
|
9a723dcbc6
|
fix philea from prod
|
2017-07-25 16:54:35 +02:00 |
|
Marion Muszynski
|
06338522e6
|
Merge branch 'ticket-12743-SavSupplier'
|
2017-07-24 16:56:15 +02:00 |
|
Marion Muszynski
|
67aed06044
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:57:58 +02:00 |
|
Marion Muszynski
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +02:00 |
|
Marion Muszynski
|
cf80e281c7
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:50:15 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
e19e7cfae3
|
Merge branch 'ticket-13755-LogStats'
|
2017-07-24 11:07:59 +02:00 |
|