Commit Graph

3152 Commits

Author SHA1 Message Date
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
Prashant Singh 3aaa84fea5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-24 11:59:17 +05:30
Prashant Singh a9bb0ca129 merge sync 2019-09-24 11:59:02 +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
Jitendra Singh a2782b63b0
Merge pull request #1495 from ghermans/mailInstall
Feature: mail configuration in web installer
2019-09-20 17:09:30 +05:30
Jitendra Singh 3ea5b06852
Merge pull request #1497 from rahulshukla-webkul/development
Development
2019-09-20 14:58:41 +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
Glenn Hermans 015c6e704c Added mail configuration 2019-09-19 16:18:34 +02:00
Jitendra Singh f2a3bfa9d4
Merge pull request #1494 from jitendra-webkul/refund
Fixed undefined variable exception in RefundRepository.php
2019-09-19 19:24:08 +05:30
jitendra e5d7124a0c Fixed undefined variable exception in RefundRepository.php 2019-09-19 19:23:21 +05:30
Jitendra Singh dc18ec044a
Merge pull request #1493 from jitendra-webkul/refund
Issue #1492 fixed
2019-09-19 19:09:55 +05:30
jitendra b0e9328090 Issue #1492 fixed 2019-09-19 18:57:58 +05:30
Jitendra Singh 16487373dc
Merge pull request #1491 from jitendra-webkul/refund
Fixed Issue #1490
2019-09-19 17:25:32 +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