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
e1332241b6
Merge pull request #3174 from jitendra-webkul/1.0
...
Issue #3113 fixed
2020-06-04 12:11:58 +05:30
fb74d35ad5
Issue #3113 fixed
2020-06-04 12:11:06 +05:30
bc5a906a00
Turkish Language added and English language duplicate rows deleted.
2020-06-03 18:22:47 +03:00
ad9c85a0f5
Turkish Language added and English language duplicate rows deleted.
2020-06-03 18:11:28 +03:00
d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension
...
Cart rule validator extension
2020-06-03 19:39:04 +05:30
1e81e4b97d
Merge pull request #3165 from shubhwebkul/master
...
check if product_id exists
2020-06-03 19:31:28 +05:30
9294eb81b3
Merge pull request #3167 from Haendlerbund/extend-editor-functionality
...
Extend CMS editor functionality
2020-06-03 19:29:30 +05:30
77e0610c89
Turkish Language added and English language duplicate rows deleted.
2020-06-03 16:22:23 +03:00
0de17f4711
Issue #3164 fixed
2020-06-03 13:25:02 +05:30
9fbd436892
add table, lists, link and hr functionality to editor
2020-06-03 09:44:19 +02:00
6ee005dda0
make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication
2020-06-03 09:24:40 +02:00
c8e987f1e9
check if product_id exists
2020-06-03 12:14:24 +05:30
51851a077a
fix compatibility issue to AbstractType
2020-06-03 07:37:26 +02:00
4104a7b2ba
Merge bagisto/master into cart-rule-validator-extension
2020-06-03 07:36:43 +02:00
b8a6619c81
Merge 'cart-rule-validator-extension' of bagisto into cart-rule-validator-extension
2020-06-03 07:16:39 +02:00
ca6933d3a8
add english translation to foreign languages
2020-06-03 07:15:56 +02:00
f99ecf6086
Refactor some changes
...
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
2020-06-03 07:12:22 +02:00
bac17a08fb
Merge pull request #3163 from jitendra-webkul/1.0
...
Fixed bundle type class compatablity issue
2020-06-02 18:53:54 +05:30
8e64676197
Fixed bundle type class compatablity issue
2020-06-02 18:49:20 +05:30
0b4b09b670
Merge pull request #3162 from bagisto/1.0
...
Added customer group price
2020-06-02 18:14:42 +05:30
ae9ec7ce9b
Added customer group price
2020-06-02 18:13:34 +05:30
5c067d11de
Fixed case sensitivity typo in Bundle class
2020-05-29 12:36:58 -04:00
4714e6d89f
add type hint
2020-05-29 13:46:20 +02:00
80bd331123
add function to remove inactive products from cart
2020-05-29 13:28:54 +02:00
2748ba84ce
add additional to all languages
2020-05-28 13:39:41 +02:00
566c65ef99
Merge 'master' into cart-rule-validator-extension
2020-05-28 13:36:13 +02:00
5f10981136
Merge 'master' of https://github.com/Haendlerbund/bagisto
2020-05-28 13:25:47 +02:00
f53a6fba16
extend cart rule validation with search in cart item additional
2020-05-28 13:14:58 +02:00
e77618f469
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-05-28 15:58:48 +05:30
1dace6e5cf
remove irrelevant code
2020-05-28 15:58:31 +05:30
05a1e0eb13
Merge pull request #3125 from kmso-de/bugfix/menu-icons-mobile
...
overlapping logo with menu icons (click action)
2020-05-28 15:09:35 +05:30
e52cba981f
Issue #3021
2020-05-27 22:09:17 +05:30
b6048ea60a
overlapping logo with menu icons (click action), built assets
2020-05-27 18:04:38 +02:00
b8417ff7d3
Issue #2804
2020-05-27 19:07:30 +05:30
9963c87bd1
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-05-27 18:37:06 +05:30
2c002a0f8a
Issue #2729
2020-05-27 18:36:52 +05:30
3fad14a569
overlapping logo with menu icons (click action)
2020-05-27 13:11:13 +02:00
b254736bd5
Merge pull request #3123 from shubhwebkul/master
...
Issue #1522 resolved
2020-05-27 16:23:20 +05:30
23fd60cf2b
Merge pull request #3121 from Haendlerbund/copy-cart-rules
...
introduce the ability to copy a cart rule
2020-05-27 16:22:54 +05:30
21eb34c64b
Merge pull request #3027 from Haendlerbund/bugfix-save-booking-products
...
#3026 fixed
2020-05-27 16:21:41 +05:30
8e3be0c692
Merge pull request #3109 from Haendlerbund/add-field-company-name-to-views
...
add field company_name to views
2020-05-27 15:04:18 +05:30
a22c2e02be
introduce cronjob to automatically deactivate expired events
2020-05-27 11:31:35 +02:00
9eb14326c4
#1522
2020-05-27 13:03:10 +05:30
c5cb04febf
Merge pull request #3112 from rahulcs0082/development
...
Development
2020-05-27 10:31:26 +05:30
b4a18bfaf3
introduce the ability to copy a cart rule
2020-05-26 13:39:54 +02:00
11fb120b51
adjust cart rule filter position a few pixels to align it as it is in products/index.blade.php
2020-05-25 08:31:12 +02:00
8a51417425
revert changes
2020-05-22 12:12:40 +02:00
5363b5645f
revert changes
2020-05-22 12:09:19 +02:00
5a7ec123c7
fix typo
2020-05-22 12:02:33 +02:00
f42974f9e8
revert changes, add flag to config
2020-05-22 11:50:17 +02:00
764df61509
trigger pipeline again
2020-05-22 09:57:34 +02:00
a500fa9074
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-05-22 13:13:10 +05:30
01884e09c0
Issue #3089 fixed
2020-05-22 13:12:36 +05:30
d664c92d30
trigger pipeline
2020-05-22 08:52:03 +02:00
f04abcbc85
add field company_name to views
2020-05-22 08:31:11 +02:00
8074168daa
Merge pull request #3105 from Haendlerbund/show-company-name-in-order-details-view
...
add field company_name to bliss views
2020-05-21 11:57:44 +05:30
e0940edbb4
Merge pull request #3104 from shubhwebkul/patch-2
...
Issue #3041 resolved
2020-05-21 11:56:52 +05:30
718a38ff02
Merge pull request #3103 from shubhwebkul/patch-1
...
Issue #2997 resolved
2020-05-21 11:56:33 +05:30
cce9167669
Merge pull request #3102 from rahulcs0082/development
...
Issue #3067 fixed
2020-05-21 11:56:12 +05:30
d0d6f2b046
add field company_name to bliss views
2020-05-20 17:44:03 +02:00
0607b15b3f
#3041
2020-05-20 19:52:00 +05:30
40bbad93b3
remove irrelevant code
2020-05-20 18:27:07 +05:30
47ae40d6b1
#2997
2020-05-20 18:24:33 +05:30
4cf8b7cddb
Issue #3089
2020-05-20 17:15:10 +05:30
17ae225444
Issue #3067 fixed
2020-05-20 16:19:25 +05:30
4842eb4de6
Merge pull request #3101 from shubhwebkul/patch-2
...
Issue #3096 resolved
2020-05-20 14:53:46 +05:30
7aa860d173
#3096
2020-05-20 13:32:34 +05:30
646e4b6241
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-05-20 12:47:44 +05:30
2fdd75ab92
#3097
2020-05-20 12:47:26 +05:30
02faf5e610
Merge pull request #3098 from rahulcs0082/development
...
Issue #3095 fixed.
2020-05-20 12:25:09 +05:30
b335321c45
Resolve conflicts
2020-05-20 12:22:31 +05:30
1dc4afc4ee
Issue #3095 fixed
2020-05-20 12:21:16 +05:30
15592aa8b1
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-05-20 12:15:36 +05:30
07db69b2f6
Issue #3095
2020-05-20 12:15:19 +05:30
4ef9e3b683
Merge pull request #3094 from rahulcs0082/development
...
Issue #3073
2020-05-19 19:20:11 +05:30
f3dd1e4d99
Issue #3073
2020-05-19 18:46:43 +05:30
74357b56a7
#3076
2020-05-19 13:56:07 +05:30
27420b5de0
Merge pull request #3074 from MattApril/bundle_item_ordering
...
Ordering bundle items in cart by sort_order rather than id
2020-05-19 12:45:24 +05:30
b4e11a842b
Merge pull request #3092 from rahulcs0082/development
...
Issue #3089
2020-05-19 12:37:57 +05:30
b520af03c3
Merge pull request #3091 from jitendra-webkul/1.0
...
SEO optimization added for velocity and og tag added
2020-05-19 12:36:31 +05:30
74a8b57801
Issue #3089
2020-05-19 12:25:40 +05:30
c63d1d97f3
SEO optimization added for velocity and og tag added
2020-05-19 11:13:29 +05:30
84aede5cef
Merge pull request #3088 from jitendra-webkul/1.0
...
Rich snippet feature added for products and category
2020-05-18 23:08:33 +05:30
94e4a165eb
Added translations to other languages
2020-05-18 23:07:12 +05:30
072b56930b
Rich snippet feature added for products and category
2020-05-18 23:04:09 +05:30
ff49583f81
Merge pull request #3078 from MattApril/product_sorting
...
Products: Fix for missing or invalid sort direction
2020-05-18 20:59:47 +05:30
3e894fc3da
Merge pull request #2999 from MattApril/fix_broken_state_taxes
...
Fixed undefined $state variable when using State based tax rates.
2020-05-18 20:56:50 +05:30
31571f94d5
Merge pull request #3084 from shubhwebkul/patch-2
...
Issue #3053 resolved
2020-05-18 20:50:48 +05:30
d42069d923
Merge pull request #3085 from shubhwebkul/patch-3
...
Issue #2994 #2973 resolved
2020-05-18 20:50:15 +05:30
576c3af7ae
Merge pull request #3086 from rahulcs0082/development
...
Issue #3079
2020-05-18 20:49:33 +05:30
5099687ebf
Issue #3079
2020-05-18 18:47:00 +05:30
2f481e4022
#2994 #2973
2020-05-18 17:11:52 +05:30
ccc24acdab
#3053
2020-05-18 15:26:37 +05:30
258009e050
remove previous changes
2020-05-18 15:25:03 +05:30
77db0f6a48
remove extra changes
2020-05-18 14:46:19 +05:30
7cf09f56ac
remove extra changes
2020-05-18 14:44:13 +05:30
be644f6134
decoded uri in search
2020-05-18 14:35:16 +05:30
1a91ef116f
#3076
2020-05-18 12:59:23 +05:30
1f5e7c0daa
Fix for missing or invalid sort direction
2020-05-15 15:49:15 -04:00
9013fd6b95
Ordering bundle items in cart by sort_order rather than id
2020-05-15 11:00:31 -04:00
782c369e28
Merge pull request #3069 from jitendra-webkul/1.0
...
Issue #2762 fixed
2020-05-15 17:02:57 +05:30
2deb7aaf77
Merge pull request #3071 from rahulcs0082/development
...
change translation for #2794
2020-05-15 17:02:37 +05:30
2ea98d4089
Merge pull request #3064 from kmso-de/feature/german-translation
...
Feature/german translation
2020-05-15 17:02:08 +05:30
Shubham Mehrotra
shivam kumar
Annika Wolff
Jitendra Singh
Pranshu Tomar
Annika Wolff
Herbert Maschke
phillipcodes
Steffen Mahler
Florian Bosdorff
İlyas Okay
phillipmohr
Herbert Maschke
Matt April
rahulshukla-home
Jan Bickel