3de5601df0
merge bagisto master, resolve conflicts
2020-06-17 08:29:55 +02:00
68ae87598c
#3248
2020-06-17 11:42:30 +05:30
967b0903e5
merge master, resolve comnflicts
2020-06-17 08:12:10 +02:00
2f0475eb15
#3249
2020-06-17 11:24:21 +05:30
976cd9f940
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2
2020-06-17 10:24:44 +05:30
bf8828326d
resolved design issues
2020-06-17 10:21:55 +05:30
74d4c15cdf
fix in route in permissions of catalog roles
2020-06-17 00:07:46 +02:00
a5dd53299c
Add catalog rules in permissions list in select tree of role
2020-06-16 23:58:42 +02:00
e156fa95fc
Merge pull request #3260 from jitendra-webkul/1.0
...
Issue fixed if booking product is null
2020-06-16 21:30:13 +05:30
960b7058b8
Issue fixed if booking product is null
2020-06-16 21:29:33 +05:30
e845c291c6
Merge pull request #3259 from jitendra-webkul/1.0
...
Issue #3219 fixed
2020-06-16 20:56:22 +05:30
d761fc2d7e
Issue #3219 fixed
2020-06-16 20:55:29 +05:30
24e75d028e
Merge pull request #3258 from jitendra-webkul/1.0
...
Issue #3237 fixed
2020-06-16 19:50:12 +05:30
2ed98a2838
Issue #3237 fixed
2020-06-16 19:49:01 +05:30
a3c5e3f7b1
Revert "Issue #3238 resolved"
2020-06-16 19:35:06 +05:30
65fddfc20d
Issue #3246 fixed
2020-06-16 19:27:53 +05:30
2c7d90deef
Homepage 404 issue fixed
2020-06-16 17:58:52 +05:30
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
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
44bceedd05
Merge pull request #3220 from Haendlerbund/enhance-orderitemfactory-and-cartitemfactory
...
extend two factories
2020-06-16 13:08:20 +05:30
9f27e46d5c
Merge pull request #3239 from ghermans/development
...
Customer details
2020-06-16 13:03:50 +05:30
87d9f78e4f
Merge pull request #3244 from shubhwebkul/patch-1
...
Issue #3238 resolved
2020-06-16 11:59:54 +05:30
7b8668da3c
updates
2020-06-15 20:48:49 +05:30
c23d58bc38
resolved rtl design issues
2020-06-15 17:26:22 +05:30
0b573bbadf
#3238
2020-06-15 14:33:43 +05:30
90eed2792b
previous changes
2020-06-15 13:45:59 +05:30
f028a0c4b1
initial
2020-06-15 09:56:16 +05:30
7b47e1f173
Added customer overview
2020-06-15 04:29:00 +02:00
ab2f3193d3
velocity meta data locale support updates
2020-06-11 20:06:30 +05:30
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
c9dd20db7e
Fixed laravel migration issue & completed tensorflow image search feature on defaul theme
2020-06-11 18:34:16 +05:30
844154024c
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-4
2020-06-11 15:10:32 +05:30
062f83ae0f
updates
2020-06-11 15:09:06 +05:30
191f3c0d8f
#2971
2020-06-11 15:02:39 +05:30
1c1d99b6af
autoformat
2020-06-11 10:56:08 +02:00
a196b7ac02
extend order item and cart item factories
2020-06-11 10:51:40 +02:00
497412abfd
Merge pull request #3201 from shivam-webkul/master
...
#3197 solved
2020-06-11 12:04:31 +05:30
8dc02414aa
merged
2020-06-11 12:03:15 +05:30
e630bef3d7
add newlines
2020-06-11 08:21:45 +02:00
94fb0c3d24
#3068 resolved & code updated
2020-06-11 11:36:32 +05:30
affd798d25
initial
2020-06-11 11:11:38 +05:30
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
65cef43a0b
#3068 resolved
2020-06-10 20:07:50 +05:30
7c5133e59f
#3214 resolved
2020-06-10 19:02:05 +05:30
faa3f6e572
#3207
2020-06-10 15:45:33 +05:30
2c9d8de97f
remove changes
2020-06-10 15:26:32 +05:30
06d025ffed
#3203
2020-06-10 15:10:47 +05:30
a5720e76d5
add a 'clear' button beneath date and datetime pickers
2020-06-10 10:33:03 +02:00
c8b64d685b
remove previous changes
2020-06-10 13:09:13 +05:30
391a4494ac
updates
2020-06-10 13:07:05 +05:30
f2d4a68366
updates
2020-06-10 13:05:50 +05:30
4049c2c550
#3202
2020-06-10 13:01:04 +05:30
ac926c5da3
added condition
2020-06-09 21:31:05 +05:30
1cd32e6a6f
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-06-09 21:22:57 +05:30
1cc4aae067
#3204
2020-06-09 21:22:22 +05:30
b8c1985beb
#3197
2020-06-09 19:22:41 +05:30
43a8f38bdc
adjust calendar icon position
2020-06-09 14:55:06 +02:00
63c29b2c37
add special prices to event tickets
2020-06-09 14:41:58 +02:00
abbd5c4a31
slightly refactoring
2020-06-09 14:35:02 +02:00
e88d92ed1a
add tests
2020-06-09 14:29:27 +02:00
60d71afa47
add tickets with special prices to cart
2020-06-09 11:22:31 +02:00
dbc16cf7e6
add logging of catched exception
2020-06-09 10:14:06 +02:00
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
21c73ab00c
Added Illuminate\Support\Arr class to CustomerFactory
2020-06-09 13:15:44 +05:30
c33d0ee7d3
Replace array_random function to Arr:random
2020-06-09 13:05:48 +05:30
25f929eef1
Merge pull request #3194 from jitendra-webkul/1.0
...
Migrate to laravel 7
2020-06-09 12:56:18 +05:30
5b398574ae
Migrate to laravel 7
2020-06-09 12:54:46 +05:30
a32925f6ce
refactor used translation function
2020-06-09 08:35:22 +02:00
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
449a2e1d47
add logging to exception thrown in cart
2020-06-09 08:15:17 +02:00
752ff116bd
bagisto master backmerge ( #26 )
...
* introduce cronjob to automatically deactivate expired events
* remove irrelevant code
* extend cart rule validation with search in cart item additional
* add additional to all languages
* add ValidatorCest
* add ValidatorCest
* Fixed case sensitivity typo in Bundle class
* Update 503.blade.php
* Added customer group price
* Fixed bundle type class compatablity issue
* Refactor some changes
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
* add english translation to foreign languages
* fix compatibility issue to AbstractType
* check if product_id exists
* make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication
* add table, lists, link and hr functionality to editor
* Issue #3164 fixed
* Turkish Language added and English language duplicate rows deleted.
* Turkish Language added and English language duplicate rows deleted.
* Turkish Language added and English language duplicate rows deleted.
* Issue #3113 fixed
* fix tiny issues due to code guidelines
* add default value for search term
* fix typo
* Fixed typo in customer group price migration
* Issue #3171 fixed
* Issue #3070 fixed
* minified jquery-ez-plus file
* Issue #3160 fixed
Co-authored-by: Shubham Mehrotra <shubh0896m@gmail.com>
Co-authored-by: Matt April <matthew.japril@gmail.com>
Co-authored-by: bhumikaisarani <63963172+bhumikaisarani@users.noreply.github.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
Co-authored-by: Herbert Maschke <thyseus@pm.me>
Co-authored-by: phillipmohr <phillip.mohr@sellerboost.de>
Co-authored-by: İlyas Okay <ilyasokay@hotmail.com>
Co-authored-by: Florian Bosdorff <florian.bosdorff@haendlerbund.de>
Co-authored-by: phillipcodes <57101430+phillipcodes@users.noreply.github.com>
2020-06-09 07:55:56 +02:00
bfd36ab55f
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-06-08 21:38:20 +05:30
ed59f3ae9d
#3172
2020-06-08 21:37:59 +05:30
d30c3e0ccd
push to save progress
2020-06-08 16:17:13 +02:00
5c2db445b8
Remove redundant filter in cart rule index page
2020-06-08 13:00:53 +02:00
bfeff060c2
Merge pull request #3187 from jitendra-webkul/1.0
...
Issue #3160 fixed
2020-06-08 16:12:35 +05:30
d2ff59cc15
Issue #3160 fixed
2020-06-08 16:10:53 +05:30
473acae380
Merge pull request #3124 from Haendlerbund/cronjob-deactivating-booking-events
...
Automatically deactivate expired event products
2020-06-08 12:11:37 +05:30
161fb5853c
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-06-05 19:40:16 +05:30
bd8315dafb
minified jquery-ez-plus file
2020-06-05 19:39:48 +05:30
ee708f9df4
Merge pull request #3180 from jitendra-webkul/1.0
...
Issue #3070 fixed
2020-06-05 18:43:37 +05:30
31b9ae7e3e
Issue #3070 fixed
2020-06-05 18:41:38 +05:30
7621cad185
Merge pull request #3178 from jitendra-webkul/1.0
...
Issue #3171 fixed
2020-06-05 16:24:13 +05:30
502beab0dd
Issue #3171 fixed
2020-06-05 16:23:09 +05:30
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
d5a803cf14
Fixed typo in customer group price migration
2020-06-05 16:17:53 +05:30
8867eccd90
fix typo
2020-06-05 11:59:52 +02:00
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
a735180f38
refactoring, add language keys
2020-06-05 08:19:13 +02:00
351c38c9e8
add default value for search term
2020-06-05 08:08:31 +02:00
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
baa9e3f571
fix tiny issues due to code guidelines
2020-06-05 07:54:47 +02:00
1b60f1b072
Merge pull request #3142 from MattApril/typo
...
Fixed case sensitivity typo in Bundle class
2020-06-04 19:59:12 +05:30
dcc6ae3f94
store in session removed
2020-06-04 13:56:00 +02:00
86dadf400d
merge branch 'bagisto/master' into check-if-item-in-cart-is-deactivated
2020-06-04 13:36:56 +02:00
1825ac9d76
improve type hints and annotations
2020-06-04 13:16:31 +02:00
6dccb1330e
store updated cart in session
2020-06-04 13:12:48 +02:00
177327a7d2
rework removing of inactive products from cart, add error handling and messaging
2020-06-04 13:09:00 +02:00
9219c283fb
Merge branch 'bagisto/master' into haendlerbund/copy-cart-rules
2020-06-04 13:05:55 +02:00
303b8765c2
Merge pull request #3173 from ilyasokay/language-development
...
Added Turkish Translation
2020-06-04 12:22:58 +05:30
Steffen Mahler
Shubham Mehrotra
AhmedUsama
Jitendra Singh
Pranshu Tomar
shubhammehrotra.symfony@webkul.com
ghermans
Annika Wolff
shivam kumar
Herbert Maschke
Annika Wolff
Herbert Maschke
phillipcodes
Florian Bosdorff