Commit Graph

6024 Commits

Author SHA1 Message Date
Carlos Augusto Gartner 540f64aa8f git subrepo init (merge) --remote=git@github.com:bagistobrasil/core-shop.git packages/Webkul/Shop
subrepo:
  subdir:   "packages/Webkul/Shop"
  merged:   "72ce4eea7"
upstream:
  origin:   "git@github.com:bagistobrasil/core-shop.git"
  branch:   "master"
  commit:   "none"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
2020-08-04 10:57:09 -03:00
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 88a1c58941 DB Prefix Added 2020-08-04 13:02:15 +05:30
Jitendra Singh ebae5786b4
Merge pull request #3627 from shubhwebkul/patch-4
Issue #3621 resolved
2020-08-04 11:29:45 +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
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 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
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 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
Shubham Mehrotra ab16b92758 updates 2020-08-01 13:53:53 +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
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