Commit Graph

5525 Commits

Author SHA1 Message Date
Jitendra Singh 4d85fc4463
Merge pull request #3252 from jitendra-webkul/1.0
Fixed paypal ipn csrf issue
2020-06-16 15:06:10 +05:30
Pranshu Tomar 9cc5e56e2c Fixed paypal ipn csrf issue 2020-06-16 15:05:40 +05:30
Jitendra Singh 3b2df1f99c
Merge pull request #3193 from Haendlerbund/add-context-to-logging-when-adding-product-to-cart
Add logging to exception thrown in cart
2020-06-16 13:54:52 +05:30
Jitendra Singh 3a948e0d50
Merge pull request #3210 from Haendlerbund/improve-date-pickers
add a 'clear' button beneath date and datetime pickers
2020-06-16 13:52:51 +05:30
Jitendra Singh 44bceedd05
Merge pull request #3220 from Haendlerbund/enhance-orderitemfactory-and-cartitemfactory
extend two factories
2020-06-16 13:08:20 +05:30
Jitendra Singh 9f27e46d5c
Merge pull request #3239 from ghermans/development
Customer details
2020-06-16 13:03:50 +05:30
Jitendra Singh 87d9f78e4f
Merge pull request #3244 from shubhwebkul/patch-1
Issue #3238 resolved
2020-06-16 11:59:54 +05:30
Jitendra Singh 837d279498
Merge pull request #3247 from shubhwebkul/patch-2
resolved rtl design issues
2020-06-16 11:59:45 +05:30
Shubham Mehrotra 7b8668da3c updates 2020-06-15 20:48:49 +05:30
Shubham Mehrotra c23d58bc38 resolved rtl design issues 2020-06-15 17:26:22 +05:30
shubhammehrotra.symfony@webkul.com 0b573bbadf #3238 2020-06-15 14:33:43 +05:30
shubhammehrotra.symfony@webkul.com 90eed2792b previous changes 2020-06-15 13:45:59 +05:30
ghermans 7b47e1f173 Added customer overview 2020-06-15 04:29:00 +02:00
Glenn Hermans 9356c400c2
Merge pull request #15 from bagisto/master
Sync wih origin repo
2020-06-15 00:40:54 +02:00
Jitendra Singh 7d350178ea
Merge pull request #3226 from shubhwebkul/patch-1
velocity meta data locale support updates
2020-06-12 14:17:39 +05:30
Shubham Mehrotra ab2f3193d3 velocity meta data locale support updates 2020-06-11 20:06:30 +05:30
Jitendra Singh 1aec1b0f2c
Merge pull request #3225 from jitendra-webkul/1.0
Remove unwanted js file
2020-06-11 18:43:12 +05:30
Pranshu Tomar 3061149fb1 Remove unwanted js file 2020-06-11 18:42:00 +05:30
Jitendra Singh 6397665ab9
Merge pull request #3224 from jitendra-webkul/1.0
Fixed laravel migration issue & completed tensorflow image search fea…
2020-06-11 18:41:03 +05:30
Pranshu Tomar c9dd20db7e Fixed laravel migration issue & completed tensorflow image search feature on defaul theme 2020-06-11 18:34:16 +05:30
Jitendra Singh 79ccc2075d
Merge pull request #3221 from shubhwebkul/patch-4
locale based velocity meta data
2020-06-11 17:32:20 +05:30
Shubham Mehrotra 844154024c Merge branch 'master' of https://github.com/bagisto/bagisto into patch-4 2020-06-11 15:10:32 +05:30
Shubham Mehrotra 062f83ae0f updates 2020-06-11 15:09:06 +05:30
Shubham Mehrotra 191f3c0d8f #2971 2020-06-11 15:02:39 +05:30
Annika Wolff 1c1d99b6af autoformat 2020-06-11 10:56:08 +02:00
Annika Wolff a196b7ac02 extend order item and cart item factories 2020-06-11 10:51:40 +02:00
Jitendra Singh 497412abfd
Merge pull request #3201 from shivam-webkul/master
#3197 solved
2020-06-11 12:04:31 +05:30
Shubham Mehrotra 8dc02414aa merged 2020-06-11 12:03:15 +05:30
shivam kumar 94fb0c3d24 #3068 resolved & code updated 2020-06-11 11:36:32 +05:30
Shubham Mehrotra affd798d25 initial 2020-06-11 11:11:38 +05:30
Jitendra Singh ac56524eca
Merge pull request #3198 from Haendlerbund/sale-prices-for-booking-events
Sale prices for booking events
2020-06-11 11:07:28 +05:30
Jitendra Singh 3659affb83
Merge pull request #3213 from shubhwebkul/patch-3
Issue #3207 resolved
2020-06-11 10:58:02 +05:30
shivam kumar 65cef43a0b #3068 resolved 2020-06-10 20:07:50 +05:30
shivam kumar 7c5133e59f #3214 resolved 2020-06-10 19:02:05 +05:30
Shubham Mehrotra faa3f6e572 #3207 2020-06-10 15:45:33 +05:30
Shubham Mehrotra 2c9d8de97f remove changes 2020-06-10 15:26:32 +05:30
Shubham Mehrotra 06d025ffed #3203 2020-06-10 15:10:47 +05:30
Herbert Maschke a5720e76d5 add a 'clear' button beneath date and datetime pickers 2020-06-10 10:33:03 +02:00
Shubham Mehrotra c8b64d685b remove previous changes 2020-06-10 13:09:13 +05:30
Shubham Mehrotra 391a4494ac updates 2020-06-10 13:07:05 +05:30
Shubham Mehrotra f2d4a68366 updates 2020-06-10 13:05:50 +05:30
Shubham Mehrotra 4049c2c550 #3202 2020-06-10 13:01:04 +05:30
Shubham Mehrotra ac926c5da3 added condition 2020-06-09 21:31:05 +05:30
Shubham Mehrotra 1cd32e6a6f Merge branch 'master' of https://github.com/bagisto/bagisto 2020-06-09 21:22:57 +05:30
Shubham Mehrotra 1cc4aae067 #3204 2020-06-09 21:22:22 +05:30
shivam kumar b8c1985beb #3197 2020-06-09 19:22:41 +05:30
Annika Wolff 43a8f38bdc adjust calendar icon position 2020-06-09 14:55:06 +02:00
Annika Wolff 63c29b2c37 add special prices to event tickets 2020-06-09 14:41:58 +02:00
Annika Wolff abbd5c4a31 slightly refactoring 2020-06-09 14:35:02 +02:00
Annika Wolff e88d92ed1a add tests 2020-06-09 14:29:27 +02:00