Commit Graph

4597 Commits

Author SHA1 Message Date
Jitendra Singh bc8e2f7eac
Merge pull request #3590 from ghermans/master
Fixed #3453
2020-08-05 11:07:17 +05:30
Jitendra Singh 07a9d8588a
Merge pull request #3608 from devansh-webkul/inactive_child_product_isssue
Fixed inactive child product shouldn't visible in grouped product #3575
2020-08-05 11:07:00 +05:30
Jitendra Singh 8ad125a8aa
Merge pull request #3610 from Haendlerbund/add-events-to-booking-product-event-ticket-repo
Add events to BookingProductEventTicketRepository
2020-08-05 11:06:54 +05:30
Jitendra Singh 1a22488ee7
Merge pull request #3650 from devansh-webkul/updating_comments
Just updated the comments in the customer and admin file.
2020-08-05 11:06:34 +05:30
Jitendra Singh 14485e28ea
Merge pull request #3613 from devansh-webkul/translation_issue_on_high_size_image
Fixed translation issue on uploading high size image #3570
2020-08-05 11:06:24 +05:30
vishal-webkul 4e1d24da76 issue #3636 resolved 2020-08-05 11:03:01 +05:30
Devansh e496ed870c Wishlist Tooltip Added 2020-08-05 10:48:01 +05:30
Devansh 1ecc79e91a Comments Updated 2020-08-05 09:28:12 +05:30
Devansh fda33fa78b Comments Updated 2020-08-05 09:26:54 +05:30
Devansh ece0f9ed60 Added In Default Theme 2020-08-04 20:42:38 +05:30
Devansh 67ddf6020e Added In Default Theme As Well 2020-08-04 20:29:19 +05:30
Devansh 561b2de404 Icon Added 2020-08-04 20:11:08 +05:30
Devansh 6d4356dc10 Added Space After Exclamation Mark 2020-08-04 18:00:56 +05:30
Devansh 2778f7a7ca Removed One Line 2020-08-04 17:43:44 +05:30
Devansh 70dc89ad41 One Line And One Line Removed 2020-08-04 17:32:00 +05:30
Jitendra Singh 72ce4eea7e
Merge pull request #3619 from devansh-webkul/mail_issue_on_cancel_order
Fixed admin is not getting mail when customer cancels order #3522
2020-08-04 17:26:32 +05:30
Devansh c22bdf45ca Template Fixed 2020-08-04 17:12:48 +05:30
Jitendra Singh 68c0395f76
Merge pull request #3645 from devansh-webkul/getting_exception_when_creating_configurable_product_db_prefix_issue
Fixed getting exception when creating configurable product in case of DB_Prefix #3642
2020-08-04 16:34:44 +05:30
Devansh a05fa10309 Refund View Issue Fixed 2020-08-04 16:10:23 +05:30
Devansh 0ddab62530 Variable Added To The Message 2020-08-04 15:51:22 +05:30
Devansh 88a1c58941 DB Prefix Added 2020-08-04 13:02:15 +05:30
Shubham Mehrotra 552f19f2d5 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-4 2020-08-04 11:18:44 +05:30
Jitendra Singh dc78fe6c3a
Merge pull request #3623 from shubhwebkul/patch-3
dynamic header content count added in velocity
2020-08-04 11:03:46 +05:30
Jitendra Singh f73aa38576
Merge pull request #3640 from akhtarkhan1/new-label-on-product
Issue Fixed #3335
2020-08-04 11:01:49 +05:30
Jitendra Singh 284fa3f406
Merge pull request #3626 from devansh-webkul/mail_are_not_sent_on_change_password
Completed Enhancement on changing current password admin/customer should get mail #3526
2020-08-04 11:01:34 +05:30
Devansh 19d8ef05ae Favicon Image Issue Fixed 2020-08-04 10:54:45 +05:30
Akhtar Khan 342b8e5ccf
Merge branch 'master' into new-label-on-product 2020-08-03 11:39:52 +05:30
Akhtar Khan 217b934563 Fixed 2020-08-03 11:08:33 +05:30
Devansh afd2de92bd Added Event Dispatcher To Account Controller's Method 2020-08-01 19:55:35 +05:30
Jitendra Singh 4cabcfab59
Merge pull request #3630 from devansh-webkul/order_id_missing_in_comment_issue
Fixed order id is missing in mail which customer get when admin add any comment in order #3515
2020-08-01 19:48:27 +05:30
Shubham Mehrotra 7d87d63b6c Merge branch 'master' of https://github.com/bagisto/bagisto into patch-5 2020-08-01 19:37:17 +05:30
Shubham Mehrotra 7a279edb49 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-4 2020-08-01 19:36:09 +05:30
Jitendra Singh e9fd421847
Merge pull request #3635 from shubhwebkul/patch-8
Issue #3628 resolved
2020-08-01 19:32:13 +05:30
Jitendra Singh df3a1288b2
Merge pull request #3634 from shubhwebkul/patch-7
Issue #3629 resolved
2020-08-01 19:31:31 +05:30
Jitendra Singh e9ec2e5c45
Merge pull request #3633 from shubhwebkul/patch-6
Issue #3631 resolved
2020-08-01 19:30:54 +05:30
vishal-webkul 27a2fd5c06 add blank stars in bliss theme star rating 2020-08-01 19:24:02 +05:30
Shubham Mehrotra 58211b2799 #3628 2020-08-01 18:57:15 +05:30
Shubham Mehrotra 8662094bf5 #3629 2020-08-01 18:49:16 +05:30
Shubham Mehrotra 8351b756bf #3631 2020-08-01 18:26:36 +05:30
Devansh 06c05f6ecd Incremental ID Added 2020-08-01 18:20:55 +05:30
Shubham Mehrotra a5ef638ed0 previous changes 2020-08-01 18:09:09 +05:30
Shubham Mehrotra 19414309e4 previous changes added 2020-08-01 18:03:05 +05:30
Shubham Mehrotra b004f96573 #3622 2020-08-01 17:59:55 +05:30
Devansh 6c48756792 Removed Array From IT Locale File As It Is Already Present Their 2020-08-01 17:08:46 +05:30
Devansh 385eeb2d7e Order ID Added To Subject 2020-08-01 17:03:05 +05:30
Shubham Mehrotra 499194c24a removed #3548 2020-08-01 15:48:15 +05:30
Shubham Mehrotra f1e3eba4f2 removed #3548 2020-08-01 15:47:39 +05:30
Shubham Mehrotra 7378c55c0c #3621 2020-08-01 15:40:59 +05:30
Devansh d7e9c8b86d Some correction done in the message 2020-08-01 15:37:20 +05:30
Devansh f05b17aa99 Enahancement Done 2020-08-01 15:07:51 +05:30
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