Commit Graph

674 Commits

Author SHA1 Message Date
Herbert Maschke 4d9bbc138f also copy images, if not skipped 2020-08-03 19:53:08 +02:00
Herbert Maschke 80d2cda443 add ability to skip product attributes when doing a copy 2020-08-03 13:32:26 +02:00
Herbert Maschke 5db4797158 refactor copy() method if ProductController.php to be a lot smaller
and split the logic into smaller functions for better readability
2020-08-03 12:40:52 +02:00
Annika Wolff 22e77f31e2 Merge master 2020-07-31 08:25:29 +02:00
Annika Wolff 12f887b50e add events to BookingProductEventTicketRepository 2020-07-31 08:24:54 +02:00
Herbert Maschke 0509f45762 introduce ability to copy an product 2020-07-30 14:15:54 +02:00
Jitendra Singh f9438fef64
Merge pull request #3585 from vishal-webkul/issue-3469
Issue #3469 fixed
2020-07-30 11:50:57 +05:30
Jitendra Singh 496b97c98a
Merge pull request #3599 from rahulcs0082/development
Issue #3591 fixed
2020-07-29 20:23:10 +05:30
rahulshukla-home 47df905950 Issue #3591 fixed 2020-07-29 20:11:33 +05:30
Jitendra Singh e3bd4e71b5
Merge pull request #3216 from iateadonut/master
update product_flat table with values when changing attribue->use_in_…
2020-07-29 17:02:56 +05:30
rahulshukla-home 42334b1bc5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-29 14:15:24 +05:30
rahulshukla-home 0434f3bcd1 Issue #3580 fixed 2020-07-29 14:14:56 +05:30
Jitendra Singh 3dba7b9177
Merge pull request #3589 from devansh-webkul/issue_on_db_prefix
DB Prefix Issue Fix #3562
2020-07-28 20:48:36 +05:30
Jitendra Singh 8ca3c284ad
Merge pull request #3588 from devansh-webkul/bundle_product_order_issue
Fixed customer is able to place order of more than available qty of any bundle option product #3557
2020-07-28 20:48:03 +05:30
Devansh 53e27b9c54 Use DB Method Instead Of Environment Variable 2020-07-28 20:25:18 +05:30
Devansh 8e78c5ccca DB Prefix Issue Fix 2020-07-28 19:57:04 +05:30
Jitendra Singh ee4f980850
Merge pull request #3563 from devansh-webkul/offset_issue
Fixed getting exception when view category page in frontend #3562
2020-07-28 18:13:52 +05:30
Devansh 8a8b9d99cf Bundle Product Order Issue Fixed 2020-07-28 15:55:12 +05:30
vishal-webkul 11edf9e4fb fixed issue #3469 2020-07-27 19:10:00 +05:30
Jitendra Singh d5d6974fa8
Merge pull request #3553 from devansh-webkul/per_page_zero_issue
Fixed products per page configuration is not working properly #3533
2020-07-27 17:14:43 +05:30
Steffen Mahler 47cfda1d13 add function isSaleable, fix error in function getChildrenIds of grouped product 2020-07-27 12:03:50 +02:00
Devansh 211ea2f853
Merge branch 'master' into offset_issue 2020-07-27 15:26:33 +05:30
Steffen Mahler a06bca38d4 fix bug, add type hints, fix annotations 2020-07-27 08:06:03 +02:00
Devansh bb9969b2db Added brackets after if 2020-07-24 19:21:40 +05:30
rahulshukla-home 34bd2a1231 Issue #3558 fixed 2020-07-24 13:18:40 +05:30
rahulshukla-home f472d7ec15 Issue #3562 fixed 2020-07-24 12:51:50 +05:30
Devansh 961c677d66 Icon fixed 2020-07-24 12:27:19 +05:30
Devansh 6f79fb31b9 Offset Issue Fixed 2020-07-23 13:50:13 +05:30
Jitendra Singh 951ac00df2
Merge pull request #3549 from devansh-webkul/sort_by_configuration_issue
Fixed sort by configuration from admin end is not working properly #3535
2020-07-22 20:58:58 +05:30
Devansh 82bd56ff76 By default sorting is working fine now 2020-07-22 18:29:18 +05:30
Steffen Mahler 6f76bb4a97 merge bagisto/master into check-if-item-in-cart-is-deactivated 2020-07-22 09:34:45 +02:00
Jitendra Singh c057f8d7c6
Merge pull request #3497 from devansh-webkul/dev
Sales icon issue fixed in grouped as well as bundle #3489
2020-07-22 12:23:55 +05:30
Devansh 9c1d908767 per page zero issue fixed 2020-07-22 11:44:02 +05:30
Devansh ce698e00ed Sort By Issue Fixed 2020-07-21 18:57:20 +05:30
Devansh 222b03ed41 Category filter limit zero issue fixed 2020-07-16 13:12:19 +05:30
Devansh 31af7220cf Reverting to previous one as this is related to another issue 2020-07-16 13:07:46 +05:30
Devansh 21596b189d Limit 0 Issue Fixed 2020-07-16 12:29:56 +05:30
Devansh 6a1a96ca59 Sales issue fixed in grouped as well as bundle 2020-07-15 20:33:53 +05:30
Steffen Mahler 2b4615b9c0 resolve conflict in CartRule.php 2020-07-15 08:44:56 +02:00
Jitendra Singh 0a662c34f6
Merge pull request #3075 from MattApril/hide_0_dollar_bundle_item_price
Hide $0 bundle option price in cart
2020-07-14 19:41:15 +05:30
Jitendra Singh 12ee962b95
Merge pull request #3302 from MattApril/disabled_bundle_options_fix
Addresses required bundle options being removed if all product option…
2020-07-14 19:40:26 +05:30
Steffen Mahler 1f61b720d5 add type hint 2020-07-14 13:39:36 +02:00
Steffen Mahler 92970b4bd4 resolve conflict in Bundle.php 2020-07-14 13:36:15 +02:00
Jitendra Singh 345c22e1e6
Merge pull request #3141 from MattApril/bundle_inventory
Added support for checking bundle inventory, and bundle product inventory.
2020-07-14 13:51:16 +05:30
Jitendra Singh 6c6c3c9b3b
Merge pull request #3476 from jitendra-webkul/1.0
Virtual inventory issue fixed
2020-07-14 12:16:38 +05:30
jitendra 3c371a781c Virtual inventory issue fixed 2020-07-14 12:07:55 +05:30
rahulshukla-home e36730e11d Issue #3443 fixed 2020-07-08 19:36:40 +05:30
Steffen Mahler 9fc7da0847 remove comment 2020-07-06 14:46:36 +02:00
Steffen Mahler 3defbeb03e fix cartRuleCest 2020-07-04 15:57:25 +02:00
Steffen Mahler b7b6257169 fix annotations 2020-07-04 15:53:12 +02:00
Steffen Mahler a44fa7445d refactoring of validateCartItem methods of product types 2020-07-04 15:20:59 +02:00
rahulshukla-home e14772377f Issue #3411 fixed 2020-07-03 13:13:25 +05:30
jitendra e5f90b92d0 Added support for search with algolia and elasticsearch 2020-07-02 17:00:21 +05:30
Steffen Mahler 492ad97b6c update annotation 2020-06-24 09:41:40 +02:00
Steffen Mahler be931439aa fix issue in validateCartItem, refactoring of CartRule helper 2020-06-23 16:33:55 +02:00
Matt April 12dc7a62a4 Addresses required bundle options being removed if all product options are disabled. #3160 2020-06-19 11:38:56 -04:00
Matt April 36444145c0 style. 2020-06-19 11:29:03 -04:00
shubhammehrotra.symfony@webkul.com 90eed2792b previous changes 2020-06-15 13:45:59 +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
dan 2afb015a6a fixed mass update attribute column for all attr types 2020-06-11 17:55:02 +09:00
shivam kumar 94fb0c3d24 #3068 resolved & code updated 2020-06-11 11:36:32 +05:30
dan 42e3a94b98 move query to repository method; use eloquent instead of raw query 2020-06-11 13:12:55 +09:00
shivam kumar 65cef43a0b #3068 resolved 2020-06-10 20:07:50 +05:30
dan abad17aaba update product_flat table with values when changing attribue->use_in_flat 2020-06-10 23:17:41 +09: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 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
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 1b60f1b072
Merge pull request #3142 from MattApril/typo
Fixed case sensitivity typo in Bundle class
2020-06-04 19:59:12 +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
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
Pranshu Tomar 0de17f4711 Issue #3164 fixed 2020-06-03 13:25:02 +05:30
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
Pranshu Tomar 8e64676197 Fixed bundle type class compatablity issue 2020-06-02 18:49:20 +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
Matt April 7cf6cdb9f0 Added product inventory levels to BundleOption - can be used to display out of stock bundle items in front end 2020-05-29 12:30:32 -04:00
Matt April e189a4fa80 Added haveSufficientQuantity() method for Bundle - checks that all required options have at least one product in stock. 2020-05-29 12:26:13 -04:00
Jitendra Singh 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
Jitendra Singh 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
Pranshu Tomar 072b56930b Rich snippet feature added for products and category 2020-05-18 23:04:09 +05:30
Matt April 1f5e7c0daa Fix for missing or invalid sort direction 2020-05-15 15:49:15 -04:00
Matt April 79922f2c93 Hide $0 bundle option price in cart 2020-05-15 11:10:41 -04:00
Matt April 9013fd6b95 Ordering bundle items in cart by sort_order rather than id 2020-05-15 11:00:31 -04:00
rahulshukla-home 426ea4d802 Issue #3050 2020-05-13 22:27:42 +05:30
Jitendra Singh afa4d5068a
Merge pull request #3023 from MattApril/product_filtering_performance
Rebuilt product filter query for improved performance.
2020-05-13 12:53:12 +05:30
rahulshukla-home 18e4af0356 Issue #3047 2020-05-12 14:23:41 +05:30
rahulshukla-home 1ddc2b42d7 Issue #3041 2020-05-11 14:51:06 +05:30
Pranshu Tomar 527affe741 Resolved conflicts 2020-05-08 21:50:06 +05:30
Pranshu Tomar cdf637f833 Added configuration for category page toolbar 2020-05-08 21:47:47 +05:30
Matt April 17b3f6bb93 Rebuilt product filter query for improved performance. 2020-05-07 20:47:20 -04:00
Jitendra Singh 4b31626930
Merge pull request #2998 from MattApril/product_price_spacing_fix
Added missing space for configurable/grouped product price.
2020-05-07 12:34:25 +05:30
Jitendra Singh adaeaf7087
Merge pull request #3010 from jitendra-webkul/1.0
Product multiple image select feature added
2020-05-06 17:08:29 +05:30
Pranshu Tomar 95caad1e7a Product multiple image select feature added 2020-05-06 17:02:44 +05:30
Matt April e31db32515 Added missing space for configurable/grouped product price. 2020-05-04 18:01:50 -04:00
rahulshukla-home fee6645138 Issue #2942 2020-04-29 14:35:49 +05:30
rahulshukla-home 65f894689b Issue #2942 2020-04-29 14:32:56 +05:30
rahulshukla-home 837c5d44fa fix category issue and change country,state order 2020-04-28 08:14:53 +05:30
Vivek d653cbd1b4 [Updated: getBaseImage() method updated for configurable product.] 2020-04-24 22:25:08 +05:30
Pranshu Tomar 8030b097e7 Moved command to packages 2020-04-23 13:46:47 +05:30
rahulshukla-home 10f76b2631 Issue #2793 2020-04-17 15:17:32 +05:30
rahulshukla-home 29ecd9aa15 Issue #2863 fixed 2020-04-17 14:27:35 +05:30
Jitendra Singh fa8120b1bf
Merge pull request #2692 from Haendlerbund/improve-have-product-faker
refactor haveProduct() method to allow custom attribute handling
2020-04-10 11:43:34 +05:30
Jitendra Singh 8bee45f7f5
Merge pull request #2857 from shubhwebkul/master
misc. bug fixes
2020-04-10 11:13:02 +05:30
rahulshukla-home f887f070c7 Issue #2793 2020-04-09 22:07:04 +05:30
Shubham Mehrotra bc23025ccc #2856 2020-04-09 18:28:52 +05:30
shivam kumar c059d137b2 code changed for api 2020-04-07 12:50:40 +05:30
shivam kumar 4ec82687cd api changes 2020-04-06 21:47:17 +05:30
Herbert Maschke 292e7c5e08 raise generated default inventory quantity to _at least_ 100 to avoid sellout in checkout tests 2020-03-31 15:41:50 +02:00
Herbert Maschke 62ceb45ee5 raise generated default inventory quantity to 80 to avoid sellout in checkout tests 2020-03-31 15:34:09 +02:00
Herbert Maschke 613b3ea523 Merge branch 'bagisto/master' into improve-have-product-faker 2020-03-30 14:43:30 +02:00
Pranshu Tomar 93e31b3ac8 Issue #2704 fixed 2020-03-23 13:47:08 +05:30
Herbert Maschke b8e4692114 refactor haveProduct() method to allow custom attribute handling 2020-03-18 14:59:10 +01:00
Jitendra Singh cdc1eb7bc1 Issue #2671 fixed 2020-03-17 13:01:37 +05:30
Jitendra Singh 4e10d706f5 Catalog price rule issue fixed if discounted and normal price is same 2020-03-13 19:03:19 +05:30
Jitendra Singh 6063c113bf Removed static text from shop datagrid 2020-03-11 12:15:03 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh d0fa3b2705 Replace DB alias with complete class name 2020-03-05 19:11:53 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
Jitendra Singh 4a6ac73bb6 Improved code style 2020-02-28 15:55:53 +05:30
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
Herbert Maschke 7083aed97a generate a dummy brand in GenerateProducts.php to fix brand linking issue after checkout of generated product 2020-02-25 14:23:00 +01:00
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Annika Wolff 154a933dc6
Merge branch 'master' into fix-tax-handling 2020-02-20 17:19:28 +01:00
rahul shukla 66ba69586d filter issue in category 2020-02-20 16:31:46 +05:30
Jitendra Singh aa1d6d145c Improved product package code style 2020-02-20 11:42:17 +05:30
Jitendra Singh a31fba56b1 Resolved conflicts 2020-02-19 17:23:18 +05:30
rahul shukla 33f882209a code improvement 2020-02-19 15:32:52 +05:30
Jitendra Singh 415eac6766 Booking migration added 2020-02-18 19:31:04 +05:30
rahulshukla-webkul 5bfe263e10
Revert "add improvements to locale determination on product creation" 2020-02-18 18:14:22 +05:30
Jitendra Singh 87c2fc35dd
Merge pull request #2481 from prateek-webkul/master
issue #2479 fixed
2020-02-18 15:28:20 +05:30
prateek srivastava 4f7cfab704 issue #2480 fixed 2020-02-18 13:56:09 +05:30
Jitendra Singh ead65981dc Add to cart completed for booking product 2020-02-17 19:25:20 +05:30
Herbert Maschke 38dbb6384d obey the default channel and configured default locale in product edit form 2020-02-10 15:05:03 +01:00
Herbert Maschke 35a9e90780 add improvements to locale determination on product creation 2020-02-07 11:16:00 +01:00
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler 0d6aee18e4 merge remote-tracking branch 'bagisto/master' into fix-tax-handling 2020-02-04 17:55:53 +01:00
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Steffen Mahler cb5e3a47f6 fix tax handling, add functional cest for cart 2020-02-04 08:50:37 +01:00