Commit Graph

2229 Commits

Author SHA1 Message Date
jitendra b707a855fc Updated refund for new product types 2019-10-10 12:33:05 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
jitendra f8db35504c Fixed checkout issue 2019-10-09 19:21:02 +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
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
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
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 2ffe9a5c12 customer channel checks removed, statuatory migration warning for those using channels specifically for customers. 2019-09-26 17:00:28 +05:30
Prashant Singh f6ce3643c0 Fixed issue #1524 2019-09-26 16:45:44 +05:30
Jitendra Singh 819b397b67
Merge pull request #1517 from prashant-webkul/development
Fixed issue with undefined variable meta title
2019-09-25 10:56:50 +05:30
Prashant Singh 8f34c70ab9 Fixed issue with undefined variable meta title 2019-09-24 19:12:51 +05:30
Jitendra Singh d439258095
Merge pull request #1516 from prashant-webkul/development
Null coalesce for title on bagisto's home page
2019-09-24 17:42:06 +05:30
Prashant Singh 2a52d24093 Null coalesce for title on bagisto's home page 2019-09-24 17:34:19 +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 ef29bb87b8
Merge pull request #1514 from prashant-webkul/development
Fixed order of page title section
2019-09-24 14:50:49 +05:30
Prashant Singh cc30b5849c Fixed order of page title section 2019-09-24 14:27:52 +05:30
Jitendra Singh 16799a43ea
Merge pull request #1513 from prashant-webkul/development
Home page title is mapped with channel's meta_title field.
2019-09-24 12:45:56 +05:30
Prashant Singh 626597fcb5 Home page title is mapped with channel's meta title 2019-09-24 12:43:49 +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 ed86b61f28
Merge pull request #1510 from jitendra-webkul/refund
Order status issue fixed
2019-09-23 17:35:42 +05:30
jitendra 59fcee0e15 Order status issue fixed 2019-09-23 17:35:00 +05:30
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