Commit Graph

3377 Commits

Author SHA1 Message Date
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
Vivek 5b6ce4a6ab [Enhancement #1232 : Added option for showing records per page in configuration.] 2019-10-18 17:07:57 +05:30
Jitendra Singh 9ef12e6055
Merge pull request #1653 from thlassche/master
Fix typo in Migration GUI
2019-10-18 15:12:50 +05:30
Vivek 6989513c62 [Added: phone and gender columns in filter.] 2019-10-18 13:31:56 +05:30
prateek srivastava 8fc60b0a4e issue #1613 fixed 2019-10-18 12:13:06 +05:30
Teun Lassche 4d2afdf071
Fix typo in Migration GUI 2019-10-17 16:38:04 +02:00
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
naresh verma 205cb21aa8 added success notification after customer delete. 2019-10-17 17:56:24 +05:30
shivam kumar eaf82987cf #1219 fixed 2019-10-17 17:47:48 +05:30
naresh verma 0b54a5edbc issue #1645 code refector 2019-10-17 17:40:33 +05:30
shivam kumar c96dd396d9 #1219 fixed 2019-10-17 17:28:08 +05:30
naresh verma 28ed55d711 Bug Fixed #1645: No confirm password action when customer is deleting his profile 2019-10-17 17:24:01 +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 Singh 8fe90bc0f6
Merge pull request #1634 from rahulshukla-webkul/development
Development
2019-10-15 19:08:11 +05:30
rahul shukla 819807b017 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-10-15 19:06:03 +05:30
rahul shukla 4761c64c6f update cart method name change for API 2019-10-15 19:05:46 +05:30
Jitendra Singh b0b96b7c42
Merge pull request #1633 from jitendra-webkul/jitendra
Issue #1631 fixed
2019-10-15 19:01:05 +05:30
jitendra 94d7289927 Issue #1631 fixed 2019-10-15 18:59:54 +05:30
Jitendra Singh 118e99a98a
Merge pull request #1610 from rahulshukla-webkul/development
cart method name for API
2019-10-15 17:28:14 +05:30
rahul shukla 345f2fa3e7 Issue #1632 2019-10-15 17:16:27 +05:30
rahul shukla 9079debe11 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-10-15 17:14:52 +05:30
Jitendra Singh 3682be697b
Merge pull request #1630 from jitendra-webkul/jitendra
Issue #1629 fixed
2019-10-15 13:11:46 +05:30
jitendra 4657430da1 Issue #1629 fixed 2019-10-15 13:10:53 +05:30
Jitendra Singh 8432eb8ecd
Merge pull request #1628 from jitendra-webkul/jitendra
Issue #1489 fixed
2019-10-15 12:37:25 +05:30
jitendra eaff6836fc Issue #1489 fixed 2019-10-15 12:35:58 +05:30
Jitendra Singh 9d96e0eee1
Merge pull request #1626 from jitendra-webkul/jitendra
Issue #1618 fixed
2019-10-14 16:27:58 +05:30
jitendra 6d4a857c7a Issue #1618 fixed 2019-10-14 15:56:35 +05:30
Jitendra Singh d54e26af4f
Merge pull request #1625 from jitendra-webkul/jitendra
Issue #1552 fixed
2019-10-14 15:09:41 +05:30
jitendra f92b58be65 Issue #1552 fixed 2019-10-14 14:47:47 +05:30
Jitendra Singh 654a24fa22
Merge pull request #1624 from jitendra-webkul/jitendra
Issue #1623 fixed
2019-10-14 14:46:03 +05:30