Commit Graph

4076 Commits

Author SHA1 Message Date
Annika Wolff 3ba83ace26 prevent flickering, use blisss theme 2020-06-11 14:23:34 +02:00
Annika Wolff af15da5433 Merge bagisto/master into admin-backend/keep-search-terms-after-new-page-load 2020-06-11 13:26:09 +02:00
Annika Wolff 2302a5a8d6 keep search terms after page reload 2020-06-11 13:00:06 +02:00
Jitendra Singh 497412abfd
Merge pull request #3201 from shivam-webkul/master
#3197 solved
2020-06-11 12:04:31 +05:30
shivam kumar 94fb0c3d24 #3068 resolved & code updated 2020-06-11 11:36:32 +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
shivam kumar 65cef43a0b #3068 resolved 2020-06-10 20:07:50 +05:30
Annika Wolff 871ce5c2c3 starting 2020-06-10 16:08:13 +02:00
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
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 e88d92ed1a add tests 2020-06-09 14:29:27 +02:00
Annika Wolff 60d71afa47 add tickets with special prices to cart 2020-06-09 11:22:31 +02:00
Jitendra Singh 415e58669c
Merge pull request #3195 from jitendra-webkul/1.0
Replace array_random function to Arr:random
2020-06-09 13:26:37 +05:30
Pranshu Tomar 21c73ab00c Added Illuminate\Support\Arr class to CustomerFactory 2020-06-09 13:15:44 +05:30
Pranshu Tomar c33d0ee7d3 Replace array_random function to Arr:random 2020-06-09 13:05:48 +05:30
Jitendra Singh 25f929eef1
Merge pull request #3194 from jitendra-webkul/1.0
Migrate to laravel 7
2020-06-09 12:56:18 +05:30
Pranshu Tomar 5b398574ae Migrate to laravel 7 2020-06-09 12:54:46 +05:30
Jitendra Singh 39a849d319
Merge pull request #3188 from thyseus/patch-1
Remove redundant filter in cart rule index page
2020-06-09 12:04:11 +05:30
Shubham Mehrotra bfd36ab55f Merge branch 'master' of https://github.com/bagisto/bagisto 2020-06-08 21:38:20 +05:30
Shubham Mehrotra ed59f3ae9d #3172 2020-06-08 21:37:59 +05:30
Annika Wolff d30c3e0ccd push to save progress 2020-06-08 16:17:13 +02:00
Herbert Maschke 5c2db445b8
Remove redundant filter in cart rule index page 2020-06-08 13:00:53 +02:00
Jitendra Singh bfeff060c2
Merge pull request #3187 from jitendra-webkul/1.0
Issue #3160 fixed
2020-06-08 16:12:35 +05:30
Pranshu Tomar d2ff59cc15 Issue #3160 fixed 2020-06-08 16:10:53 +05:30
Jitendra Singh 473acae380
Merge pull request #3124 from Haendlerbund/cronjob-deactivating-booking-events
Automatically deactivate expired event products
2020-06-08 12:11:37 +05:30
Shubham Mehrotra 161fb5853c Merge branch 'master' of https://github.com/bagisto/bagisto 2020-06-05 19:40:16 +05:30
Shubham Mehrotra bd8315dafb minified jquery-ez-plus file 2020-06-05 19:39:48 +05:30
Jitendra Singh ee708f9df4
Merge pull request #3180 from jitendra-webkul/1.0
Issue #3070 fixed
2020-06-05 18:43:37 +05:30
Pranshu Tomar 31b9ae7e3e Issue #3070 fixed 2020-06-05 18:41:38 +05:30
Jitendra Singh 7621cad185
Merge pull request #3178 from jitendra-webkul/1.0
Issue #3171 fixed
2020-06-05 16:24:13 +05:30
Pranshu Tomar 502beab0dd Issue #3171 fixed 2020-06-05 16:23:09 +05:30
Jitendra Singh c64c282b50
Merge pull request #3177 from jitendra-webkul/1.0
Fixed typo in customer group price migration
2020-06-05 16:18:29 +05:30
Pranshu Tomar d5a803cf14 Fixed typo in customer group price migration 2020-06-05 16:17:53 +05:30
phillipcodes 8867eccd90
fix typo 2020-06-05 11:59:52 +02:00
Jitendra Singh c5dd54ff68
Merge pull request #3175 from Haendlerbund/fix-search-when-missing-term
bugfix: add default value for search term
2020-06-05 12:18:48 +05:30
Florian Bosdorff 351c38c9e8 add default value for search term 2020-06-05 08:08:31 +02:00
Jitendra Singh 8a529ce0a8
Merge pull request #3166 from Haendlerbund/copy-cart-rules
make a prefix to the copied cart rule ('copy of XXX')
2020-06-05 11:34:06 +05:30
Florian Bosdorff baa9e3f571 fix tiny issues due to code guidelines 2020-06-05 07:54:47 +02:00