Commit Graph

2278 Commits

Author SHA1 Message Date
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
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
Sopizhenko 9569b38b19
fix the problem with layered navigation on pages 2019-09-26 11:29:44 +03:00
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
Jitendra Singh 117c616661
Merge pull request #1505 from rahulshukla-webkul/development
#1504
2019-09-23 12:51:56 +05:30
Jitendra Singh 240a0eb2bd
Merge pull request #1506 from jitendra-webkul/refund
Issue #1492 fixed
2019-09-23 12:51:36 +05:30
jitendra 1bee8c0dde Issue #1492 fixed 2019-09-23 12:50:40 +05:30
rahul shukla 93101de44c #1504 2019-09-23 12:36:07 +05:30
Jitendra Singh 8eab8210d6
Merge pull request #1503 from jitendra-webkul/refund
Refund grantotal issue fixed with different currency
2019-09-23 11:49:14 +05:30
jitendra 80cdd1826b Refund grantotal issue fixed with different currency 2019-09-23 11:48:25 +05:30
Jitendra Singh a989173357
Merge pull request #1501 from jitendra-webkul/refund
Item status added in refund create page items table
2019-09-20 19:46:27 +05:30
jitendra 04ef6a6882 Item status added in refund create page items table 2019-09-20 19:45:52 +05:30
Jitendra Singh e1aedd8ac1
Merge pull request #1500 from jitendra-webkul/refund
Removed comment from Order.php listener file
2019-09-20 19:39:16 +05:30
jitendra aa6f5affc0 Removed comment from Order.php listener file 2019-09-20 19:38:42 +05:30
Jitendra Singh 850e357363
Merge pull request #1499 from jitendra-webkul/refund
Refund feature added
2019-09-20 19:37:42 +05:30
jitendra 7a56f5761f Refund feature added 2019-09-20 19:36:41 +05:30
Jitendra Singh f581db8dd9
Merge pull request #1498 from jitendra-webkul/refund
Issue #1489 fixed
2019-09-20 18:50:54 +05:30
jitendra ca23da77a9 Issue #1489 fixed 2019-09-20 18:49:59 +05:30
rahul shukla 7779688d64 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-20 14:50:07 +05:30
rahul shukla 58331043e9 translatable package update 2019-09-20 14:49:53 +05:30
ghermans 79adb77380 Started improving the admin scss files 2019-09-20 02:40:25 +02:00
jitendra e5d7124a0c Fixed undefined variable exception in RefundRepository.php 2019-09-19 19:23:21 +05:30
jitendra b0e9328090 Issue #1492 fixed 2019-09-19 18:57:58 +05:30
jitendra 600a4a9be0 Fixed Issue #1490 2019-09-19 17:24:56 +05:30
Jitendra Singh fb43bb1752
Merge pull request #1488 from jitendra-webkul/refund
Front order item grandtotal issue fixed
2019-09-19 15:48:39 +05:30
jitendra 46a29488d0 Front order item grandtotal issue fixed 2019-09-19 15:48:01 +05:30
Jitendra Singh 4c55c7c498
Merge pull request #1487 from jitendra-webkul/refund
Issue #1486 fixed
2019-09-19 15:26:57 +05:30
jitendra 9db41abe13 Issue #1486 fixed 2019-09-19 15:26:07 +05:30
Jitendra Singh e87968da70
Merge pull request #1485 from jitendra-webkul/refund
Refund issues fixed
2019-09-19 13:53:06 +05:30
jitendra ccd86eee76 Refund issues fixed 2019-09-19 13:52:33 +05:30
Jitendra Singh cee52398a1
Merge pull request #1478 from jitendra-webkul/refund
Refund
2019-09-18 19:12:40 +05:30
jitendra 84969849d1 Added translations 2019-09-18 19:12:05 +05:30
jitendra 4e856d02e8 Redund status added 2019-09-18 19:06:25 +05:30
Jitendra Singh f99b88f41f
Merge pull request #1477 from jitendra-webkul/refund
Translation added
2019-09-18 19:03:27 +05:30
jitendra 382dee4da2 Translation added 2019-09-18 19:02:34 +05:30
Jitendra Singh 7619ede6a2
Merge pull request #1476 from jitendra-webkul/refund
Refund system completed
2019-09-18 18:59:48 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
rahul shukla 8429a5fccf dashboard dats issue 2019-09-17 16:56:45 +05:30
rahul shukla b13a82efaf Issue #1258, Invoice creation after paypal 2019-09-17 16:22:53 +05:30
rahul shukla 5f8ea65835 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-17 12:36:59 +05:30
rahul shukla b3651a135a Issue #1461 2019-09-17 12:36:36 +05:30
Jitendra Singh 09b84d01f4
Merge pull request #1464 from rahulshukla-webkul/development
Development
2019-09-16 19:16:50 +05:30
jitendra 49230b7071 Discount updted 2019-09-16 19:06:12 +05:30
Jitendra Singh 7a23c60ff0
Merge pull request #1465 from prashant-webkul/development
Catalog Rule & Cart Rule: Fixed a bug in sku finding which was using like instead of equals ope…
2019-09-16 17:56:06 +05:30
Prashant Singh c5aec7445d Fixed a bug in sku finding which was using like instead of equals operator 2019-09-16 16:16:45 +05:30
rahul shukla d3c68573d2 locale based error message 2019-09-16 13:53:56 +05:30
rahul shukla 4ddcaed81d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-16 13:52:04 +05:30
rahul shukla 62b2a3f9c3 locale based error message 2019-09-16 13:51:47 +05:30
Jitendra Singh 58306e3252
Merge pull request #1448 from prateek-webkul/master
Issue #1442 fixed
2019-09-16 10:19:58 +05:30
Jitendra Singh 9cc13c8ca6
Merge pull request #1462 from codeinnovers/master
fix of issue #1460
2019-09-16 10:18:42 +05:30
CodeInnovers 3d03bc099c fixed issue #1460 2019-09-15 23:33:35 +05:30
rahul shukla 53030b2a21 conditon added for checkout back button 2019-09-13 17:02:46 +05:30
rahul shukla 00b83b1398 change defualt payment method & oderder number in customer invoice 2019-09-13 15:54:05 +05:30
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
rahul shukla 48d86f05e8 Issue #1260 & mail logo 2019-09-13 15:04:29 +05:30