Commit Graph

4210 Commits

Author SHA1 Message Date
Pranshu Tomar d761fc2d7e Issue #3219 fixed 2020-06-16 20:55:29 +05:30
Jitendra Singh 24e75d028e
Merge pull request #3258 from jitendra-webkul/1.0
Issue #3237 fixed
2020-06-16 19:50:12 +05:30
Pranshu Tomar 2ed98a2838 Issue #3237 fixed 2020-06-16 19:49:01 +05:30
Jitendra Singh a3c5e3f7b1
Revert "Issue #3238 resolved" 2020-06-16 19:35:06 +05:30
Pranshu Tomar 65fddfc20d Issue #3246 fixed 2020-06-16 19:27:53 +05:30
Annika Wolff 15d9155a9d refactoring 2020-06-16 15:33:03 +02:00
Pranshu Tomar 2c7d90deef Homepage 404 issue fixed 2020-06-16 17:58:52 +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
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
Shubham Mehrotra f028a0c4b1 initial 2020-06-15 09:56:16 +05:30
ghermans 7b47e1f173 Added customer overview 2020-06-15 04:29:00 +02:00
Shubham Mehrotra ab2f3193d3 velocity meta data locale support updates 2020-06-11 20:06:30 +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
Annika Wolff 9bf7810a5f add encoding of search terms 2020-06-11 14:56:05 +02:00
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
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
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
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
Annika Wolff 60d71afa47 add tickets with special prices to cart 2020-06-09 11:22:31 +02:00
Annika Wolff dbc16cf7e6 add logging of catched exception 2020-06-09 10:14:06 +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
Annika Wolff a32925f6ce refactor used translation function 2020-06-09 08:35:22 +02:00
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
Annika Wolff 449a2e1d47 add logging to exception thrown in cart 2020-06-09 08:15:17 +02:00
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
Jitendra Singh 1b60f1b072
Merge pull request #3142 from MattApril/typo
Fixed case sensitivity typo in Bundle class
2020-06-04 19:59:12 +05:30
Florian Bosdorff 9219c283fb Merge branch 'bagisto/master' into haendlerbund/copy-cart-rules 2020-06-04 13:05:55 +02:00
Jitendra Singh 303b8765c2
Merge pull request #3173 from ilyasokay/language-development
Added Turkish Translation
2020-06-04 12:22:58 +05:30
Jitendra Singh e1332241b6
Merge pull request #3174 from jitendra-webkul/1.0
Issue #3113 fixed
2020-06-04 12:11:58 +05:30
Pranshu Tomar fb74d35ad5 Issue #3113 fixed 2020-06-04 12:11:06 +05:30
İlyas Okay bc5a906a00 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:22:47 +03:00
İlyas Okay ad9c85a0f5 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:11:28 +03:00
Jitendra Singh d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension
Cart rule validator extension
2020-06-03 19:39:04 +05:30
Jitendra Singh 1e81e4b97d
Merge pull request #3165 from shubhwebkul/master
check if product_id exists
2020-06-03 19:31:28 +05:30
Jitendra Singh 9294eb81b3
Merge pull request #3167 from Haendlerbund/extend-editor-functionality
Extend CMS editor functionality
2020-06-03 19:29:30 +05:30
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
Pranshu Tomar 0de17f4711 Issue #3164 fixed 2020-06-03 13:25:02 +05:30
phillipmohr 9fbd436892 add table, lists, link and hr functionality to editor 2020-06-03 09:44:19 +02:00
Herbert Maschke 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
Shubham Mehrotra c8e987f1e9 check if product_id exists 2020-06-03 12:14:24 +05:30
Annika Wolff 51851a077a fix compatibility issue to AbstractType 2020-06-03 07:37:26 +02:00
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Annika Wolff b8a6619c81 Merge 'cart-rule-validator-extension' of bagisto into cart-rule-validator-extension 2020-06-03 07:16:39 +02:00
Annika Wolff ca6933d3a8 add english translation to foreign languages 2020-06-03 07:15:56 +02:00
Annika Wolff f99ecf6086
Refactor some changes
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
2020-06-03 07:12:22 +02:00
Jitendra Singh bac17a08fb
Merge pull request #3163 from jitendra-webkul/1.0
Fixed bundle type class compatablity issue
2020-06-02 18:53:54 +05:30
Pranshu Tomar 8e64676197 Fixed bundle type class compatablity issue 2020-06-02 18:49:20 +05:30
Jitendra Singh 0b4b09b670
Merge pull request #3162 from bagisto/1.0
Added customer group price
2020-06-02 18:14:42 +05:30
Pranshu Tomar ae9ec7ce9b Added customer group price 2020-06-02 18:13:34 +05:30
Matt April 5c067d11de Fixed case sensitivity typo in Bundle class 2020-05-29 12:36:58 -04:00
Annika Wolff 2748ba84ce add additional to all languages 2020-05-28 13:39:41 +02:00
Annika Wolff 566c65ef99 Merge 'master' into cart-rule-validator-extension 2020-05-28 13:36:13 +02:00
Annika Wolff 5f10981136 Merge 'master' of https://github.com/Haendlerbund/bagisto 2020-05-28 13:25:47 +02:00
Annika Wolff f53a6fba16 extend cart rule validation with search in cart item additional 2020-05-28 13:14:58 +02:00
Shubham Mehrotra e77618f469 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-05-28 15:58:48 +05:30
Shubham Mehrotra 1dace6e5cf remove irrelevant code 2020-05-28 15:58:31 +05:30
Jitendra Singh 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
rahulshukla-home e52cba981f Issue #3021 2020-05-27 22:09:17 +05:30
Jan Bickel b6048ea60a overlapping logo with menu icons (click action), built assets 2020-05-27 18:04:38 +02:00
rahulshukla-home b8417ff7d3 Issue #2804 2020-05-27 19:07:30 +05:30
rahulshukla-home 9963c87bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-27 18:37:06 +05:30
rahulshukla-home 2c002a0f8a Issue #2729 2020-05-27 18:36:52 +05:30
Jan Bickel 3fad14a569 overlapping logo with menu icons (click action) 2020-05-27 13:11:13 +02:00
Jitendra Singh b254736bd5
Merge pull request #3123 from shubhwebkul/master
Issue #1522 resolved
2020-05-27 16:23:20 +05:30
Jitendra Singh 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
Jitendra Singh 21eb34c64b
Merge pull request #3027 from Haendlerbund/bugfix-save-booking-products
#3026 fixed
2020-05-27 16:21:41 +05:30
Jitendra Singh 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
Annika Wolff a22c2e02be introduce cronjob to automatically deactivate expired events 2020-05-27 11:31:35 +02:00
Shubham Mehrotra 9eb14326c4 #1522 2020-05-27 13:03:10 +05:30
Jitendra Singh c5cb04febf
Merge pull request #3112 from rahulcs0082/development
Development
2020-05-27 10:31:26 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Herbert Maschke 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
Annika Wolff 8a51417425 revert changes 2020-05-22 12:12:40 +02:00
Annika Wolff 5363b5645f revert changes 2020-05-22 12:09:19 +02:00
Steffen Mahler 5a7ec123c7 fix typo 2020-05-22 12:02:33 +02:00
Annika Wolff f42974f9e8 revert changes, add flag to config 2020-05-22 11:50:17 +02:00
Steffen Mahler 764df61509 trigger pipeline again 2020-05-22 09:57:34 +02:00
rahulshukla-home a500fa9074 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-22 13:13:10 +05:30
rahulshukla-home 01884e09c0 Issue #3089 fixed 2020-05-22 13:12:36 +05:30
Steffen Mahler d664c92d30 trigger pipeline 2020-05-22 08:52:03 +02:00
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Jitendra Singh 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
Jitendra Singh e0940edbb4
Merge pull request #3104 from shubhwebkul/patch-2
Issue #3041 resolved
2020-05-21 11:56:52 +05:30
Jitendra Singh 718a38ff02
Merge pull request #3103 from shubhwebkul/patch-1
Issue #2997 resolved
2020-05-21 11:56:33 +05:30
Jitendra Singh cce9167669
Merge pull request #3102 from rahulcs0082/development
Issue #3067 fixed
2020-05-21 11:56:12 +05:30
Steffen Mahler d0d6f2b046 add field company_name to bliss views 2020-05-20 17:44:03 +02:00
Shubham Mehrotra 0607b15b3f #3041 2020-05-20 19:52:00 +05:30
Shubham Mehrotra 40bbad93b3 remove irrelevant code 2020-05-20 18:27:07 +05:30
Shubham Mehrotra 47ae40d6b1 #2997 2020-05-20 18:24:33 +05:30
rahulshukla-home 4cf8b7cddb Issue #3089 2020-05-20 17:15:10 +05:30
rahulshukla-home 17ae225444 Issue #3067 fixed 2020-05-20 16:19:25 +05:30