Commit Graph

1081 Commits

Author SHA1 Message Date
jitendra 257392cd2a Issue #1118 fixed 2019-11-07 17:39:59 +05:30
jitendra 65d4e8698a Issue #924 fixed 2019-11-07 15:42:34 +05:30
jitendra faef8adcdb Issue #1745 fixed' 2019-11-07 12:50:40 +05:30
jitendra 19b8de0ffb Issue #1167 fixed 2019-11-06 13:54:57 +05:30
jitendra 30e2a743e8 Issue #1303 fixed 2019-11-05 19:02:07 +05:30
jitendra 62d5fb1c15 Issue #1704 fixed (Update channel 'Base Curreny' label to 'Default Currency') 2019-11-05 16:53:46 +05:30
jitendra 08e87ccf8d Issue #1559 fixed 2019-11-05 16:23:43 +05:30
Jitendra Singh 65a7008452
Merge pull request #1734 from rahulshukla-webkul/development
Issue #1733
2019-11-05 12:02:19 +05:30
rahul shukla 2f82ba1f95 Issue #1733 2019-11-05 11:20:28 +05:30
jitendra c0a4e2fe26 Issue #1721 fixed 2019-10-31 19:06:52 +05:30
Jitendra Singh 9baf4cac3a
Merge pull request #1709 from prashant-webkul/bugs_patch_1
Added logo, favicon in fillable of channel model
2019-10-31 12:21:03 +05:30
Prashant Singh e5082cca3b Added logo, favicon in fillable of channel model 2019-10-30 10:40:12 +05:30
Jitendra Singh 3cbbbbe340
Merge pull request #1481 from codeinnovers/master
fix of issue #1480
2019-10-24 18:51:40 +05:30
Jitendra Singh 4fcff1e111
Merge pull request #1650 from shivam-webkul/shivam
[Bug Fixed #1219 ] & [Enhancement #1182]  Fixed
2019-10-24 10:36:53 +05:30
Jitendra Singh 70b7a712c7
Merge pull request #1691 from prashant-webkul/bugs_patch_1
Fixed issues related to Promotions: Cart Rule
2019-10-24 10:29:39 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
Jitendra Singh c0162e6491
Merge pull request #1689 from jitendra-webkul/jitendra
Issue #1686 fixed
2019-10-23 13:50:51 +05:30
jitendra 0824a47d1d Issue #1686 fixed 2019-10-23 13:49:40 +05:30
Jitendra Singh 75eeddc1b1
Merge pull request #1665 from rumansaleem/fix-hardcoded-bagisto
Replace hardcoded 'Bagisto' with application name from config.
2019-10-21 12:01:26 +05:30
Amritanshu a6f9c35738 #1303 reverted 2019-10-19 15:38:07 +05:30
Amritanshu 9fc6837386 Error pages views redirected to Admin error pages #1303 - fixed 2019-10-19 15:29:45 +05:30
Ruman Saleem b8967a5c22 Replace hardcoded 'Bagisto' with application name - fixes #1614 2019-10-19 13:51:00 +05:30
Jitendra Singh bfcd52618b
Merge pull request #1659 from vivek-webkul/patch-7
[Enhancement #1232 : Added option for showing records per page in con…
2019-10-18 20:14:57 +05:30
shivam kumar fd8a1fb851 #1182 fixed 2019-10-18 18:43:38 +05:30
rahul shukla 859cd04660 compile all assest 2019-10-18 18:21:12 +05:30
Jitendra Singh 65d9c0b283
Merge pull request #1652 from vivek-webkul/patch-5
[Enhancement #737: Fields added to the customer DataGrid and customer…
2019-10-18 17:42:07 +05:30
Jitendra Singh ce2a9742a4
Merge pull request #1646 from vivek-webkul/patch-3
[Bug Fixed #1555: order refund export related issue resolved.]
2019-10-18 17:40:30 +05:30
Vivek 5b6ce4a6ab [Enhancement #1232 : Added option for showing records per page in configuration.] 2019-10-18 17:07:57 +05:30
Vivek 6989513c62 [Added: phone and gender columns in filter.] 2019-10-18 13:31:56 +05:30
Vivek f8767adc0d [Enhancement #737: Fields added to the customer DataGrid and customer addresses section added at admin end.] 2019-10-17 18:12:51 +05:30
shivam kumar c96dd396d9 #1219 fixed 2019-10-17 17:28:08 +05:30
Vivek ee5a63c4e4 [Bug Fixed #1640 and #1642: Customer delete issue resolved if any invoice is in pending.] 2019-10-17 15:17:02 +05:30
Vivek 6ab2d5046c [Bug Fixed #1555: order refund export related issue resolved.] 2019-10-17 12:36:09 +05:30
jitendra f92b58be65 Issue #1552 fixed 2019-10-14 14:47:47 +05:30
jitendra fe688852c5 Resolve conflicts 2019-10-14 12:25:43 +05:30
jitendra b24c2507e8 Issue #1250 fixed 2019-10-14 12:22:58 +05:30
Jitendra Singh 79a3abeb55
Merge pull request #1619 from jitendra-webkul/jitendra
Issue #1609 fixed
2019-10-14 11:33:44 +05:30
jitendra 707ff1207c Issue #1609 fixed 2019-10-14 11:32:50 +05:30
Jitendra Singh 53750b73ce
Merge pull request #1617 from jitendra-webkul/jitendra
Issue #1609 fixed
2019-10-14 10:15:17 +05:30
jitendra aa44440fef Issue #1609 fixed 2019-10-14 10:14:18 +05:30
Jitendra Singh 0e900ac4b9
Merge pull request #1603 from jitendra-webkul/jitendra
Issue #1552 fixed
2019-10-11 12:33:44 +05:30
jitendra 660f4173d1 Issue #1552 fixed 2019-10-11 12:32:44 +05:30
Jitendra Singh db7013be3f
Merge pull request #1579 from prashant-webkul/development
Datagrid actions enhancement
2019-10-11 11:52:25 +05:30
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
Webkul 9e2e73d0b3 Datagrid actions enhancement, now action can have a key called condition which must return boolean in order to trigger that action's visibility 2019-10-10 13:53:36 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30