Commit Graph

4597 Commits

Author SHA1 Message Date
vishal-webkul b4cb34f971 issue #3606 fixed 2020-08-01 14:10:16 +05:30
Shubham Mehrotra ab16b92758 updates 2020-08-01 13:53:53 +05:30
vishal-webkul a8646a3459 update in issue 3313 2020-08-01 12:46:04 +05:30
Shubham Mehrotra 3a7d94f183 Remove previous changes 2020-08-01 12:22:08 +05:30
Shubham Mehrotra 33a939e02c Remove previous changes 2020-08-01 12:21:33 +05:30
Shubham Mehrotra ecaafc1909 #3530 2020-08-01 12:15:22 +05:30
Devansh 5a25eb14e1 Cancelled Order Mail Issue Fixed 2020-08-01 11:11:52 +05:30
Shubham Mehrotra d3a4ab7076 #3548 2020-08-01 10:39:26 +05:30
Devansh 9c68a78597 Attribute Added 2020-07-31 16:58:49 +05:30
Devansh 3f7388394c Translation Added 2020-07-31 16:05:30 +05:30
vishal-webkul 88003bca32 update issue 3313 fixed 2020-07-31 15:14:11 +05:30
vishal-webkul 013eafc7a1 fix issue 3313 2020-07-31 15:02:18 +05:30
vishal-webkul 770e3b69fa
Merge branch 'master' into issue-3313 2020-07-31 14:04:22 +05:30
Jitendra Singh 4afc0a5883
Merge pull request #3596 from vishal-webkul/issue-3531
Issue #3531 fixed
2020-07-31 13:49:04 +05:30
Devansh 8c498dabea Bulk Delete Issue Fixed 2020-07-31 13:46:29 +05:30
vishal-webkul 14a4960ff0 issue-3313 update 2020-07-31 13:34:58 +05:30
Jitendra Singh 96e6d35760
Merge pull request #3609 from vishal-webkul/issue-3604
Issue #3604 fixed
2020-07-31 12:16:36 +05:30
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
vishal-webkul 3261867202 issue #3604 fixed 2020-07-31 11:10:27 +05:30
Devansh a99096392b Inactive Child Issue Fix 2020-07-31 10:59:05 +05:30
Devansh 4a3482b4d5 File Name Added 2020-07-31 10:00:57 +05:30
Devansh 77636d367f Message Added 2020-07-30 20:16:05 +05:30
Devansh 737c3eae77 Language Translation Added 2020-07-30 19:25:49 +05:30
Devansh 242445d818 Merge branch 'unable_to_download_files_while_comparing_products' of https://github.com/devansh-webkul/bagisto into unable_to_download_files_while_comparing_products
Merged
2020-07-30 18:36:38 +05:30
Devansh c9e4a99e76 Language Key Added 2020-07-30 18:35:23 +05:30
Devansh db972083de
Merge branch 'master' into unable_to_download_files_while_comparing_products 2020-07-30 18:22:31 +05:30
Devansh 0cac0a8ab8 Compare Product Download Issue Fixed 2020-07-30 18:11:56 +05:30
vishal-webkul 170b6c63e6 getting exception while using filter total column and applying other the equals to condition 2020-07-30 14:56:01 +05:30
vishal-webkul 729a7c966d fixed issue #3313 2020-07-30 13:36:20 +05:30
vishal-webkul 0f1aafe5ae
Merge branch 'master' into issue-3531 2020-07-30 13:02:44 +05:30
vishal-webkul ec89568bf6 fixed above mentioned issue 2020-07-30 12:57:51 +05:30
Devansh dfc346ec76 Order Issue Fixed 2020-07-30 12:40:15 +05:30
Jitendra Singh e6d11ed809
Merge pull request #3223 from Haendlerbund/admin-backend/keep-search-terms-after-new-page-load
Admin DataGrid: Keep search terms after page reload
2020-07-30 12:30:21 +05:30
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 be3bb4690b
Merge pull request #3594 from vishal-webkul/issue-2971
Issue #2971 fixed
2020-07-30 11:36:15 +05:30
ghermans 5ed6fa5dc7 fixed route 2020-07-29 23:01:44 +02:00
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
Jitendra Singh 455c606a7c
Merge pull request #3598 from akhtarkhan1/patch4
cancel button position fixed #3521
2020-07-29 20:30:52 +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
vishal-webkul c2679f9c8d resolve conflict problem 2020-07-29 20:10:19 +05:30
Glenn Hermans 5bcdcd60f2
Merge branch 'master' into master 2020-07-29 16:24:33 +02:00
Jitendra Singh 3634439e6d
Merge pull request #3566 from devansh-webkul/shipping_charge_is_not_getting_calculated_properly
Fixed shipping charge is not getting calculated properly #3546
2020-07-29 19:46:37 +05:30
Jitendra Singh 4724059229
Merge pull request #3597 from devansh-webkul/admin_name_enhancement
I would like like to change the admin route or url #3595
2020-07-29 19:43:07 +05:30
Akhtar Khan e587fe2448 Fixed issue 2020-07-29 19:37:02 +05:30
Devansh 32140a0e23 Some Enhancement 2020-07-29 19:06:43 +05:30
vishal-webkul 3995b2056d issue #3531 fixed 2020-07-29 19:03:10 +05:30
Glenn Hermans 52163fb78f Moved payment & shipping method 2020-07-29 14:31:59 +02:00
Devansh 724e823b99 Handled One Test Case 2020-07-29 17:44:48 +05:30
Glenn Hermans 3863ae7b72 fixed requested changes 2020-07-29 14:02:06 +02:00
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
vishal-webkul b81bb3580a add the default locale icon with each field which are support for multi-locale in the metadata #2971 2020-07-29 16:26:37 +05:30
Jitendra Singh 74153f813d
Merge pull request #3539 from akhtarkhan1/patch4
Fixed layout issue in order information in default theme at customer #3521
2020-07-29 15:38:58 +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
Akhtar Khan abfac60381
Merge branch 'master' into patch4 2020-07-29 09:50:05 +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
Glenn Hermans 701d94e62e ready for testing 2020-07-28 16:48:27 +02:00
Glenn Hermans fa120062df Updated translations 2020-07-28 16:45:36 +02:00
Devansh 8e78c5ccca DB Prefix Issue Fix 2020-07-28 19:57:04 +05:30
Shubham Mehrotra d1bf19d96c Merge branch 'master' of https://github.com/bagisto/bagisto 2020-07-28 19:16:48 +05:30
Shubham Mehrotra 198d778328 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-07-28 18:59:00 +05:30
Jitendra Singh 74bcf073c1
Merge pull request #3511 from vishal-webkul/issue-3495
Issue #3488 fixed
2020-07-28 18:16:03 +05:30
Jitendra Singh 619659be31
Merge pull request #3565 from akhtarkhan1/searchProduct
filter tag is out of box in search key term for long product name #3445
2020-07-28 18:15:40 +05:30
Jitendra Singh e792cd882f
Merge pull request #3510 from vishal-webkul/swatch-images
Fixed Issue #3491 broken image for color image swatch type
2020-07-28 18:14:56 +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
Jitendra Singh 076309d8dc
Merge pull request #3586 from devansh-webkul/rtl_dynamic_issue
RTL Dynamic Issue Fixed #3487
2020-07-28 18:12:38 +05:30
Jitendra Singh e4931c9559
Merge pull request #3579 from devansh-webkul/coupon_code_issue
Fixed auto generated coupon codes are not getting applied #3556
2020-07-28 18:12:24 +05:30
Jitendra Singh 03f13b82b5
Merge pull request #3571 from akhtarkhan1/locale_broken_image
Fixed Getting broken image link for locales in mobile view #3393
2020-07-28 18:12:05 +05:30
Jitendra Singh 216029210c
Merge pull request #3573 from devansh-webkul/cartrule_issue
CartRule Issue Fixed #3554
2020-07-28 18:11:20 +05:30
Annika Wolff cea94c7296
Merge branch 'master' into admin-backend/keep-search-terms-after-new-page-load 2020-07-28 13:21:31 +02:00
Devansh 8a8b9d99cf Bundle Product Order Issue Fixed 2020-07-28 15:55:12 +05:30
Glenn Hermans 7ed5cd4133 Updated Invoices datagrid 2020-07-27 17:08:21 +02:00
Glenn Hermans 80f3befe7c Added translations for invoices 2020-07-27 17:07:50 +02:00
Glenn Hermans c023ee95d7 Init changes for invoices 2020-07-27 17:07:19 +02:00
Devansh 55a6a77a7c RTL Dynamic Issue Fixed 2020-07-27 19:57:07 +05:30
vishal-webkul 11edf9e4fb fixed issue #3469 2020-07-27 19:10:00 +05:30
vishal-webkul 8a0b3cffe9 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-3469 2020-07-27 19:02:49 +05:30
Jitendra Singh fb4dfda2ee
Merge pull request #3583 from rahulcs0082/development
Development
2020-07-27 17:15:11 +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
Akhtar Khan 906496b7b1 Space issue fixed 2020-07-27 16:08:48 +05:30
rahulshukla-home 89aa4ef7f5 merge with master 2020-07-27 16:05:00 +05:30
rahulshukla-home 1e7f9c2f41 Issue #3548 fixed 2020-07-27 16:03:49 +05:30
Devansh 211ea2f853
Merge branch 'master' into offset_issue 2020-07-27 15:26:33 +05:30
Jitendra Singh 74adb7233a
Revert "Issue #3547 fixed" 2020-07-27 15:16:02 +05:30
Jitendra Singh bb5f331d66
Merge pull request #3555 from vishal-webkul/issue-3547
Issue #3547 fixed
2020-07-27 15:15:30 +05:30
Jitendra Singh 8e675424cf
Merge pull request #3568 from rahulcs0082/development
Issue #3561 fixed
2020-07-27 15:04:19 +05:30
Devansh 1febcf8843 Auto Generated Coupon Issue Fixed 2020-07-27 14:28:29 +05:30
Devansh f7d5e72935 Cart Issue Fixed 2020-07-25 18:56:47 +05:30
Devansh e89c1cbd4a CartRule Issue Fixed 2020-07-25 13:08:48 +05:30
Shubham Mehrotra b5cd1ea285 #3484 2020-07-24 20:17:23 +05:30
Akhtar Khan e7125d9a57
Update view.blade.php 2020-07-24 19:50:28 +05:30
Akhtar Khan 4e6d49ac83
Update app.scss
add spacing
2020-07-24 19:35:49 +05:30
Devansh bb9969b2db Added brackets after if 2020-07-24 19:21:40 +05:30
Akhtar Khan da70e8b662 Fixed Getting broken image link for locales in mobile view #3393 2020-07-24 19:04:44 +05:30
Akhtar Khan af34c809a0 Merge branch 'master' of https://github.com/bagisto/bagisto into locale_broken_image 2020-07-24 18:55:35 +05:30
Annika Wolff 2e434f39d7 npm run productive 2020-07-24 15:11:17 +02:00
Annika Wolff 194e8e1395 Merge 'bagisto-master' 2020-07-24 15:06:35 +02:00
Annika Wolff 40aa4848ed Merge remote changes 2020-07-24 15:05:24 +02:00
Annika Wolff 8dec3cdd14 show filtered channels, locales and customer groups by name 2020-07-24 15:04:20 +02:00
rahulshukla-home e5aecb092e Issue #3548 fixed 2020-07-24 18:08:38 +05:30
Shubham Mehrotra bb3940c1b6 #3506 2020-07-24 17:17:34 +05:30
Devansh 58842f4254 CSS Issue Fixed 2020-07-24 13:42:41 +05:30
rahulshukla-home 34bd2a1231 Issue #3558 fixed 2020-07-24 13:18:40 +05:30
Akhtar Khan e6d21c64d5 fixed 2020-07-24 13:09:03 +05:30
Akhtar Khan fa8c8a52ab fixed final 2020-07-24 13:03:10 +05:30
vishal-webkul 1e80bc658d fixed image code is invalid issue 3494 2020-07-24 13:01:24 +05:30
rahulshukla-home f472d7ec15 Issue #3562 fixed 2020-07-24 12:51:50 +05:30
Akhtar Khan a58b895127 fixed layout 2020-07-24 12:36:05 +05:30
Devansh 961c677d66 Icon fixed 2020-07-24 12:27:19 +05:30
rahulshukla-home ecba982184 Issue #3561 fixed 2020-07-24 12:18:26 +05:30
vishal-webkul 6178712996 fixed city missing issue in checkout page 2020-07-24 10:59:57 +05:30
Devansh 83c5b6b963 Shipping Charges Issue Fixed 2020-07-23 20:42:11 +05:30
Akhtar Khan 632780d30b
Delete ui.js.LICENSE.txt 2020-07-23 19:45:53 +05:30
Akhtar Khan d3c0dc48e8 fixed 2020-07-23 19:44:55 +05:30
Akhtar Khan 3ae2e577e3 filter tag is out of box in search key #3445 2020-07-23 19:34:44 +05:30
Akhtar Khan 1b47fe52d1 issue fixed 2020-07-23 19:03:27 +05:30
Akhtar Khan 398fa8032c RTL cancel button in order section #3521 2020-07-23 16:05:36 +05:30
vishal-webkul d599e38c81 issue #3494 #3495 fixed 2020-07-23 15:32:55 +05:30
vishal-webkul ccaf52b102 color attribute default swatch value should be selected as dropdown swatch - issue fixed #3488 2020-07-23 15:32:55 +05:30
vishal-webkul ece86e530b Broken image for color image swatch type - issue fixed #3491 2020-07-23 15:32:55 +05:30
vishal-webkul d32af2c684 Back icon is not working in catalog and cart rule grid - Bug Fixed 2020-07-23 15:32:55 +05:30
Devansh 6f79fb31b9 Offset Issue Fixed 2020-07-23 13:50:13 +05:30
Akhtar Khan f14a6e5a13 admin search product 2020-07-23 10:33:51 +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
vishal-webkul 8e5051acd3 issue #3547 fixed 2020-07-22 15:31:35 +05:30
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
vishal-webkul 1ae5ad201f
Merge branch 'master' into issue-3495 2020-07-22 09:39:00 +05:30
vishal-webkul 25e3849f7a
Merge branch 'master' into swatch-images 2020-07-22 09:37:00 +05:30
Jitendra Singh 9f1bded941
Merge pull request #3540 from devansh-webkul/rtl_issue_right_image_to_left
Fixed Velocity RTL product image zoom floats right - not showing #3487
2020-07-21 19:53:02 +05:30
Jitendra Singh 897994c0d7
Merge pull request #3536 from devansh-webkul/layered-navigation-layout-isssue
Layout issue on category page for filterable attributes fixed #3485
2020-07-21 19:52:48 +05:30
Jitendra Singh 25a3d93c31
Merge pull request #3529 from devansh-webkul/admin-email-in-default-locale
Admin should get mail according to admin's default locale issue fixed #3520
2020-07-21 19:52:25 +05:30
Devansh ce698e00ed Sort By Issue Fixed 2020-07-21 18:57:20 +05:30
Akhtar Khan 28d9c04a68 Fixed (Mobile view) getting product image issue when set grid as List type in category page #3532 2020-07-21 15:59:23 +05:30
Devansh 8f7c711c43 RTL Layout Issue Fixed 2020-07-21 13:38:58 +05:30
Akhtar Khan 0da8d86904 Fixed layout issue in order information in default theme at customer end #3521 2020-07-21 13:09:28 +05:30
Jitendra Singh c8dd07c8c8
Merge pull request #3537 from jitendra-webkul/1.0
Issue #3451 fixed
2020-07-20 23:04:05 +05:30
jitendra ba8151c223 Issue #3451 fixed 2020-07-20 23:03:16 +05:30
Devansh 86ab33b424 Layout issue fixed 2020-07-20 20:18:36 +05:30
Devansh 9f7b3dd5ee Admin Email In Their Default Locale 2020-07-20 16:34:09 +05:30
Annika Wolff da114b4679
Merge branch 'master' into admin-backend/keep-search-terms-after-new-page-load 2020-07-20 11:15:30 +02:00
rahulshukla-home 17a2309217 Issue #3490 fixed 2020-07-20 11:11:30 +05:30
Jitendra Singh c6e7ef3e5f
Merge pull request #3517 from shivam-webkul/master
issue #3514 resolved
2020-07-17 16:02:13 +05:30
Jitendra Singh d905e3e621
Merge pull request #3492 from akhtarkhan1/patch3
Fixed layout issue in order and downloadable grid at customer #3472
2020-07-17 15:58:09 +05:30
shivam kumar e8983f308d issue #3514 resolved 2020-07-17 15:53:35 +05:30