Commit Graph

6009 Commits

Author SHA1 Message Date
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
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
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
Jitendra Singh 13f93a758f
Merge pull request #3620 from shubhwebkul/patch-2
Issue #3530 resolved
2020-08-01 19:29:40 +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
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 8861f9c80b Merge branch 'master' of https://github.com/bagisto/bagisto 2020-08-01 16:07:40 +05:30
Jitendra Singh 5ec9baef0f
Merge pull request #3618 from shubhwebkul/patch-1
Issue #3548 resolved
2020-08-01 15:56:03 +05:30
Shubham Mehrotra f1e3eba4f2 removed #3548 2020-08-01 15:47:39 +05:30
Devansh f05b17aa99 Enahancement Done 2020-08-01 15:07:51 +05:30
Shubham Mehrotra 3a7d94f183 Remove previous changes 2020-08-01 12:22:08 +05:30
Shubham Mehrotra ecaafc1909 #3530 2020-08-01 12:15:22 +05:30
Shubham Mehrotra d3a4ab7076 #3548 2020-08-01 10:39:26 +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
Jitendra Singh 96e6d35760
Merge pull request #3609 from vishal-webkul/issue-3604
Issue #3604 fixed
2020-07-31 12:16:36 +05:30
vishal-webkul 3261867202 issue #3604 fixed 2020-07-31 11:10:27 +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 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
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
Jitendra Singh 594094b41e
Merge pull request #3601 from ghermans/3595
Fixed #3595
2020-07-30 11:12:47 +05:30
ghermans 43f0c79ec5 added admin url to testing env file 2020-07-29 23:38:38 +02:00
ghermans 5ed6fa5dc7 fixed route 2020-07-29 23:01:44 +02:00
ghermans f4b69964d2 Fixed leftover from #3595 2020-07-29 22:50:15 +02:00
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
Glenn Hermans c2c57a34ca
Merge pull request #28 from bagisto/master 2020-07-29 21:59:29 +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
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
Devansh 724e823b99 Handled One Test Case 2020-07-29 17:44:48 +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