Commit Graph

1036 Commits

Author SHA1 Message Date
jitendra a7d44e9daa Issue #1584 fixed 2019-10-11 10:35:51 +05:30
jitendra 2dedd5fbbf Issue #1581 fixed 2019-10-10 19:46:19 +05:30
jitendra 64198cae11 Issue #1580 fixed 2019-10-10 19:42:35 +05:30
jitendra 121c7c7e36 Issue #1585 fixed 2019-10-10 19:37:31 +05:30
jitendra 4bf577c37b Issue #1578 fixed 2019-10-10 19:31:08 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla 2020006d47 Issue #1548 2019-10-07 13:15:07 +05:30
Jitendra Singh b64c7241ba
Merge pull request #1533 from prashant-webkul/development
Fixed issue #1532
2019-10-01 10:06:11 +05:30
Webkul 109c99f3da Made footer text content optional from configuration apart from custom content also 2019-09-30 15:57:35 +05:30
rahul shukla 2d0094f330 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-26 17:51:48 +05:30
rahul shukla 53a275f1fd translation for depandent field 2019-09-26 17:51:28 +05:30
Jitendra Singh 04c93e2339
Merge pull request #1527 from prashant-webkul/development
Development
2019-09-26 17:07:16 +05:30
Prashant Singh f6ce3643c0 Fixed issue #1524 2019-09-26 16:45:44 +05:30
rahul shukla 6125252fda Change Invoice to Order in Invoice Order configuration 2019-09-24 17:20:26 +05:30
Jitendra Singh 30626a1c20
Merge pull request #1496 from ghermans/admin
Started improving the admin scss files
2019-09-24 16:26:27 +05:30
Jitendra Singh d8e1ae5baf
Merge pull request #1512 from jitendra-webkul/refund
Dashboard avg sale issue fixed
2019-09-24 12:41:46 +05:30
jitendra 1acf86acf8 Dashboard avg sale issue fixed 2019-09-24 12:35:18 +05:30
Glenn Hermans cb9fd50a6a
Fixed typo 2019-09-23 14:33:54 +02:00
Jitendra Singh 35acdc5e0a
Merge pull request #1508 from jitendra-webkul/refund
Refuned total issue fixed
2019-09-23 16:50:07 +05:30
jitendra 1fc043b5b7 Refuned total issue fixed 2019-09-23 16:49:34 +05:30
Jitendra Singh ecc144b7b5
Merge pull request #1507 from jitendra-webkul/refund
Dashboard sales calculation issue fixed
2019-09-23 15:31:20 +05:30
jitendra 6cf1879920 Dashboard sales calculation issue fixed 2019-09-23 15:26:21 +05:30
Jitendra Singh 117c616661
Merge pull request #1505 from rahulshukla-webkul/development
#1504
2019-09-23 12:51:56 +05:30
jitendra 1bee8c0dde Issue #1492 fixed 2019-09-23 12:50:40 +05:30
rahul shukla 93101de44c #1504 2019-09-23 12:36:07 +05:30
jitendra 04ef6a6882 Item status added in refund create page items table 2019-09-20 19:45:52 +05:30
jitendra aa6f5affc0 Removed comment from Order.php listener file 2019-09-20 19:38:42 +05:30
jitendra 7a56f5761f Refund feature added 2019-09-20 19:36:41 +05:30
ghermans 79adb77380 Started improving the admin scss files 2019-09-20 02:40:25 +02:00
jitendra b0e9328090 Issue #1492 fixed 2019-09-19 18:57:58 +05:30
Jitendra Singh e87968da70
Merge pull request #1485 from jitendra-webkul/refund
Refund issues fixed
2019-09-19 13:53:06 +05:30
jitendra ccd86eee76 Refund issues fixed 2019-09-19 13:52:33 +05:30
Jitendra Singh cee52398a1
Merge pull request #1478 from jitendra-webkul/refund
Refund
2019-09-18 19:12:40 +05:30
jitendra 4e856d02e8 Redund status added 2019-09-18 19:06:25 +05:30
Jitendra Singh 7619ede6a2
Merge pull request #1476 from jitendra-webkul/refund
Refund system completed
2019-09-18 18:59:48 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
rahul shukla 8429a5fccf dashboard dats issue 2019-09-17 16:56:45 +05:30
Jitendra Singh 58306e3252
Merge pull request #1448 from prateek-webkul/master
Issue #1442 fixed
2019-09-16 10:19:58 +05:30
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
rahul shukla c39255e254 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-13 14:35:29 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
Prashant Singh a7b2925db4 Fixed issue #1452 2019-09-13 11:01:54 +05:30
Jitendra Singh cdbd654f4f
Merge pull request #1451 from prashant-webkul/development
Development
2019-09-13 10:18:24 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
rahul shukla 61da74ee2b Issue #1447 2019-09-12 16:25:51 +05:30
Prashant Singh b089149268 Fixed issue #1428 2019-09-12 16:21:03 +05:30
Jitendra Singh e604037adf
Merge pull request #1445 from prashant-webkul/development
Fixed issue #1288 #1434 #1444
2019-09-12 11:14:27 +05:30
Prashant Singh 6c82802371 Fixed issues #1444 & #1434 2019-09-11 20:10:59 +05:30