Commit Graph

3254 Commits

Author SHA1 Message Date
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
Jitendra Singh ff99c1469e
Merge pull request #1693 from jitendra-webkul/jitendra
Issue #1684 fixed
2019-10-24 10:26:02 +05:30
Prashant Singh 77958e4dda Uncommented some needed code 2019-10-23 19:02:33 +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 ce52c1832e Issue #1684 fixed 2019-10-23 18:45:48 +05:30
Jitendra Singh e3be82b56d
Merge pull request #1690 from jitendra-webkul/jitendra
Issue #1489 fixed
2019-10-23 17:52:50 +05:30
jitendra 8671abfcd3 Issue #1489 fixed 2019-10-23 17:52:01 +05:30
jitendra 11ac344415 Issue #1686 fixed 2019-10-23 15:07:42 +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 782a050877
Merge pull request #1688 from jitendra-webkul/jitendra
Issue #1489 fixed
2019-10-23 13:39:25 +05:30
jitendra e5d606c33e Issue #1489 fixed 2019-10-23 13:38:29 +05:30
shivam kumar 101785cbf7 minor chanegs 2019-10-23 13:06:34 +05:30
Jitendra Singh 1701f070b3
Merge pull request #1687 from jitendra-webkul/jitendra
Issue #1680 fixed
2019-10-23 10:52:06 +05:30
jitendra be83a12752 Issue #1680 fixed 2019-10-23 10:49:44 +05:30
Jitendra Singh 7729966d00
Merge pull request #1683 from jitendra-webkul/jitendra
Issue #1680 fixed
2019-10-22 18:57:54 +05:30
jitendra 22fe76c83c Issue #1680 fixed 2019-10-22 18:57:06 +05:30
Jitendra Singh b9c69fe251
Merge pull request #1681 from jitendra-webkul/jitendra
Issue #1620, #1671 fixed
2019-10-22 17:39:41 +05:30
jitendra 937fda187f Issue #1620, #1671 fixed 2019-10-22 17:38:35 +05:30
Jitendra Singh 02f0d004b0
Merge pull request #1651 from naresh-webkul/development
Bug Fixed #1645: No confirm password action when customer is deleting…
2019-10-22 16:01:28 +05:30
Jitendra Singh ea2f91e704
Merge pull request #1663 from MattApril/dev
Fixed duplicate view_render_event for product descriptions
2019-10-22 12:58:08 +05:30
Jitendra Singh f693ae3ad8
Merge pull request #1677 from jitendra-webkul/jitendra
Issue #1676 fixed
2019-10-22 11:05:08 +05:30
jitendra 822b6014b4 Issue #1676 fixed 2019-10-22 11:03:42 +05:30
shivam kumar ce6766b305 design changes and fixed minor issue 2019-10-21 15:37:51 +05:30
naresh verma 2d2302c398 resolve conflicts 2019-10-21 13:38:29 +05:30
Jitendra Singh 8b6e4bacc1
Merge pull request #1675 from jitendra-webkul/jitendra
Issues #1620, #1671 fixed
2019-10-21 13:38:26 +05:30
jitendra 2695e88630 Issues #1620, #1671 fixed 2019-10-21 13:37:19 +05:30
naresh verma 33e8445ba8 added translation [issue fixed #1645] 2019-10-21 13:26:23 +05:30
Jitendra Singh 506de47305
Merge pull request #1664 from pathak-vikash/patch-1
Rename WAMP to WampServer to match with official | Fix typo for XAMPP
2019-10-21 12:01:45 +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
Jitendra Singh ad0df78567
Merge pull request #1668 from rana-amritanshu/master
#1251 - fixed
2019-10-21 11:52:55 +05:30
Jitendra Singh 752b20d68b
Merge pull request #1669 from rumansaleem/fix-remove-from-wishlist
Remove item from wishlist, when added to Cart - fixes #1662
2019-10-21 11:45:58 +05:30
Ruman Saleem 742479d34a Remove item from wishlist, when added to Cart. 2019-10-19 15:54:53 +05:30
Amritanshu a6f9c35738 #1303 reverted 2019-10-19 15:38:07 +05:30
Amritanshu 5baa1ede20 Replace SERVER['REQUEST_URI'] with Larvel's request object #1251 2019-10-19 15:35:05 +05:30
Amritanshu 9fc6837386 Error pages views redirected to Admin error pages #1303 - fixed 2019-10-19 15:29:45 +05:30
Ruman Saleem bb4d29d35e fix typo 2019-10-19 13:59:47 +05:30
Ruman Saleem b8967a5c22 Replace hardcoded 'Bagisto' with application name - fixes #1614 2019-10-19 13:51:00 +05:30
Vikash Pathak 9342a597e2 Rename WAMP to WampServer to match with official | Fix typo for XAMPP 2019-10-19 13:31:52 +05:30
Matt April 27a9a32f14 Fixed duplicate view_render_event for product descriptions - changed from .before to .after 2019-10-18 17:54:43 -04:00
Jitendra Singh c688764a83
Merge pull request #1654 from prateek-webkul/development
issue #1613 fixed
2019-10-18 20:17:30 +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
naresh verma bfddda8ce2 resolved conflicts [issue #1645] 2019-10-18 19:43:03 +05:30
shivam kumar fd8a1fb851 #1182 fixed 2019-10-18 18:43:38 +05:30
Jitendra Singh 813362a490
Merge pull request #1661 from rahulshukla-webkul/development
compile all assest
2019-10-18 18:28:12 +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
Jitendra Singh d718147251
Merge pull request #1649 from vivek-webkul/patch-4
[Bug Fixed #1640 and #1642: Customer delete issue resolved if any inv…
2019-10-18 17:37:32 +05:30