Commit Graph

2456 Commits

Author SHA1 Message Date
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 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
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
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
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
prateek srivastava 8fc60b0a4e issue #1613 fixed 2019-10-18 12:13:06 +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
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
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
rahul shukla 9079debe11 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-10-15 17:14:52 +05:30
jitendra 4657430da1 Issue #1629 fixed 2019-10-15 13:10:53 +05:30
jitendra eaff6836fc Issue #1489 fixed 2019-10-15 12:35:58 +05:30
jitendra 6d4a857c7a Issue #1618 fixed 2019-10-14 15:56:35 +05:30
jitendra f92b58be65 Issue #1552 fixed 2019-10-14 14:47:47 +05:30
jitendra 95d427d42c Issue #1623 fixed 2019-10-14 14:45:09 +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 6914c56f0c Issue #1455 fixed 2019-10-14 10:30:37 +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 8d33d74f85
Merge pull request #1616 from jitendra-webkul/jitendra
Purchased downloadable product grid date filter issue fixed
2019-10-14 09:52:43 +05:30
jitendra 21fcc50597 Purchaes downloadable product grid date filter issue fixed 2019-10-14 09:51:22 +05:30
Jitendra Singh d810f7c75b
Merge pull request #1615 from jitendra-webkul/jitendra
Issue #1611 fixed
2019-10-14 09:19:11 +05:30
jitendra 1dfe3a513d Issue #1611 fixed 2019-10-14 09:18:15 +05:30
rahul shukla 539119d6ad cart method name for API 2019-10-11 15:06:02 +05:30
Jitendra Singh 3a040b8ff3
Merge pull request #1608 from jitendra-webkul/jitendra
Issue #1607 fixed
2019-10-11 13:51:17 +05:30
jitendra 373d313e84 Issue #1607 2019-10-11 13:50:15 +05:30
rahul shukla e011e70506 category repository issue 2019-10-11 13:27:53 +05:30
Jitendra Singh 10b4fcddd9
Merge pull request #1605 from jitendra-webkul/jitendra
Issue #1550 fixed
2019-10-11 13:03:43 +05:30
jitendra 381fa408ee Issue #1550 fixed 2019-10-11 13:02:34 +05:30
Jitendra Singh 51c23a87da
Merge pull request #1604 from jitendra-webkul/jitendra
Issue #1552 fixed
2019-10-11 12:38:33 +05:30
jitendra adf10bca30 Issue #1552 fixed 2019-10-11 12:37:26 +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 c2ac6c035f
Merge pull request #1602 from prashant-webkul/development
Fixed issue #1595
2019-10-11 12:29:45 +05:30
Prashant Singh 744549f8a5 Fixed issue #1595 2019-10-11 12:26:23 +05:30
Jitendra Singh d184c375cc
Merge pull request #1601 from jitendra-webkul/jitendra
Issue #1587 fixed
2019-10-11 12:19:02 +05:30
jitendra 41a78c87b3 Issue #1587 fixed 2019-10-11 12:18:19 +05:30
Jitendra Singh f8f7df4125
Merge pull request #1600 from jitendra-webkul/jitendra
Issue #1592 fixed
2019-10-11 12:13:23 +05:30
jitendra bd804ddb4a Assets compiled for production 2019-10-11 12:12:34 +05:30
jitendra 0864dd5d1a Issue #1592 fixed 2019-10-11 12:11:07 +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 Singh 5357578944
Merge pull request #1599 from jitendra-webkul/jitendra
Issue #1568 fixed
2019-10-11 11:47:18 +05:30
jitendra a3bb10a8b6 Issue #1568 fixed 2019-10-11 11:46:19 +05:30
Jitendra Singh d5d488fbd2
Merge pull request #1598 from jitendra-webkul/jitendra
Issue #1569 fixed
2019-10-11 11:39:18 +05:30
jitendra e829a8c1a9 Issue #1569 fixed 2019-10-11 11:38:30 +05:30
Jitendra Singh 028a7db2bc
Merge pull request #1597 from jitendra-webkul/jitendra
Issue #1571 fixed
2019-10-11 11:21:52 +05:30
jitendra 195330c192 Issue #1571 fixed 2019-10-11 11:19:46 +05:30
jitendra 310f426272 Issue #1582 fixed 2019-10-11 11:00:16 +05:30
jitendra a7d44e9daa Issue #1584 fixed 2019-10-11 10:35:51 +05:30
Jitendra Singh 503a82c38c
Merge pull request #1596 from jitendra-webkul/jitendra
Issue #1583 fixed
2019-10-11 10:33:25 +05:30
jitendra 79a80e666f Issue #1583 fixed 2019-10-11 10:32:40 +05:30
Jitendra Singh 69f03a66c4
Merge pull request #1591 from jitendra-webkul/jitendra
Issue #1581 fixed
2019-10-10 19:47:06 +05:30
jitendra 2dedd5fbbf Issue #1581 fixed 2019-10-10 19:46:19 +05:30
Jitendra Singh cb1bdf47d5
Merge pull request #1590 from jitendra-webkul/jitendra
Issue #1580 fixed
2019-10-10 19:44:06 +05:30
jitendra 64198cae11 Issue #1580 fixed 2019-10-10 19:42:35 +05:30
Jitendra Singh f88d986d6a
Merge pull request #1589 from jitendra-webkul/jitendra
Issue #1585 fixed
2019-10-10 19:39:00 +05:30
jitendra 121c7c7e36 Issue #1585 fixed 2019-10-10 19:37:31 +05:30
Jitendra Singh 82491b009d
Merge pull request #1588 from jitendra-webkul/jitendra
Issue #1578 fixed
2019-10-10 19:32:06 +05:30
jitendra 4bf577c37b Issue #1578 fixed 2019-10-10 19:31:08 +05:30
Jitendra Singh f555a38d18
Merge pull request #1586 from jitendra-webkul/jitendra
Issue #1574 fixed
2019-10-10 17:46:36 +05:30
jitendra 210a19757f Issue #1574 fixed 2019-10-10 17:41:30 +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 Singh bd31bbd208
Merge pull request #1576 from prashant-webkul/development
Footer links issue is resolved (issue #1522)
2019-10-10 13:42:43 +05:30
Webkul 3819e6e2ed resolved issue #1522 2019-10-10 13:35:41 +05:30
Jitendra Singh 5bb6e1870c
Merge pull request #1577 from jitendra-webkul/jitendra
Issue #1573 fixed
2019-10-10 13:23:47 +05:30
jitendra e21fb3d6cd Issue #1573 fixed 2019-10-10 13:21:46 +05:30
Webkul baad7ecb0a Footer links issue is resolved 2019-10-10 13:17:46 +05:30
Jitendra Singh 4e0a5847d5
Merge pull request #1521 from Sopizhenko/master
Fix for issue #1433
2019-10-10 13:16:23 +05:30
Jitendra Singh 853885a283
Merge pull request #1542 from accountmine/master
Issue #1540
2019-10-10 13:15:28 +05:30
Jitendra Singh e85f07af08
Merge pull request #1564 from rahulshukla-webkul/development
Fixed issue #1563
2019-10-10 13:03:59 +05:30
Jitendra Singh 62e8826d17
Merge pull request #1572 from prashant-webkul/development
Generate product command bug fix
2019-10-10 12:39:03 +05:30
Jitendra Singh 0223ffda8e
Merge pull request #1570 from jitendra-webkul/jitendra
Updated refund for new product types
2019-10-10 12:34:05 +05:30
Webkul 0cbf50b657 Generate product command bug fix 2019-10-10 12:33:20 +05:30
jitendra b707a855fc Updated refund for new product types 2019-10-10 12:33:05 +05:30
Jitendra Singh 3c9ef6ee45
Merge pull request #1558 from marcmascarell/patch-1
Spanish translation for Shop module
2019-10-10 11:06:21 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
rahul shukla 6752476317 conflict resolve 2019-10-09 19:29:07 +05:30
jitendra f8db35504c Fixed checkout issue 2019-10-09 19:21:02 +05:30
rahul shukla 28c65329d7 Checkout conflict resolve 2019-10-09 18:45:39 +05:30
rahul shukla bcd656e364 Issue #1563 2019-10-09 18:30:18 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
Jitendra Singh fc920e14c5
Merge pull request #1549 from rahulshukla-webkul/development
Issue #1548
2019-10-09 16:21:34 +05:30
Marc Mascarell c011d19c39
Spanish translation for Shop module 2019-10-09 11:22:12 +02:00
Prashant Singh 0792a7ff96 Release version updated. 2019-10-09 11:20:01 +05:30
rahul shukla 878c0eb8e5 Issue #1463 2019-10-07 16:36:16 +05:30
rahul shukla 2020006d47 Issue #1548 2019-10-07 13:15:07 +05:30
Username 7ea2010a59 Issue #1540 2019-10-02 22:31:38 -07:00
Jitendra Singh 2933b24147
Merge pull request #1541 from prashant-webkul/development
Fixed decimal precision issue for currency_exchange_rates table's rate column.
2019-10-03 10:59:39 +05:30
Prashant Singh a40afa36be Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-10-03 10:57:29 +05:30
Prashant Singh 3bd2fd571d Fixed issue #1539 2019-10-03 10:57:07 +05:30
Jitendra Singh 0d5245690b
Merge pull request #1538 from prashant-webkul/development
Development
2019-10-01 16:38:48 +05:30
rahul shukla f3bd135cec change way for default shipping & payment method selection 2019-10-01 16:33:18 +05:30
rahul shukla d27dfd1c1e change way for default shipping & payment method selection 2019-10-01 16:26:49 +05:30
Webkul 0b8364a6aa Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-10-01 14:58:25 +05:30
Webkul f1785894d0 Attribute family id in GenerateProduct class was hardcoded replaced it with a dyamic query 2019-10-01 14:57:56 +05:30
rahul shukla 45ff0b5602 route update for product create command 2019-10-01 14:50:56 +05:30
Jitendra Singh b79d607113
Merge pull request #1536 from prashant-webkul/development
Create simple product with random data using command…
2019-10-01 11:02:45 +05:30
Webkul 73686a86fe Create simple product with random data using command php artisan generate:product/products {quantity}, helpful for testing framework right out of the box 2019-10-01 11:00:11 +05:30
Jitendra Singh 3660c1e2e2
Merge pull request #1531 from melorbany/hotfix/arabic_translation
Update Arabic localization text.
2019-10-01 10:06:38 +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
Prashant Singh ba4dc11687 Fixed issue #1532 2019-09-30 10:56:38 +05:30
Mohamed Elorbany a048f9d76a Update Arabic localization text. 2019-09-29 13:38:47 +03:00
rahul shukla 5d63416e95 localization message improvement 2019-09-27 19:46:14 +05:30
rahul shukla fda8498721 merge with master 2019-09-27 15:23:58 +05:30