Commit Graph

276 Commits

Author SHA1 Message Date
rahul shukla 16e4a109ea Configurtion form validation improvement 2020-02-05 16:07:00 +05:30
Florian Bosdorff 5188b1b7f9 Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-28 08:15:11 +01:00
Florian Bosdorff d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
Herbert Maschke 4596a77c07 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 11:36:26 +01:00
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh a6960f2916
Merge pull request #2068 from jitendra-webkul/1.0
Removed Developement menu
2020-01-17 14:49:25 +05:30
Jitendra Singh eb3fdc12c6 Removed Developement menu 2020-01-17 14:48:39 +05:30
Herbert Maschke e0c2814f2e Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-15 15:29:55 +01:00
Herbert Maschke 57aa522282 introduce company_name and vat_id also in shop admin backend 2020-01-15 14:02:51 +01:00
Jitendra Singh 2049c45b0f
Merge pull request #2056 from jitendra-webkul/1.0
Issue #1863 fixed
2020-01-15 17:09:20 +05:30
Jitendra Singh b4319e1f38 Issue #1863 fixed 2020-01-15 17:08:37 +05:30
David Große 9524c78ad5 various code style improvements 2020-01-14 10:49:22 +01:00
rahul shukla 7110804889 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-14 12:37:18 +05:30
rahul shukla 7e1b5fa693 Issue #1808 2020-01-14 12:37:03 +05:30
Jitendra Singh 5ce709d31a
Merge pull request #2028 from rahulshukla-webkul/development
Issue #1808
2020-01-10 16:57:49 +05:30
rahul shukla 6d6efbb49c Issue #1808 2020-01-10 16:50:20 +05:30
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
rahul shukla 0f0cc82058 Issue #1983 2020-01-09 13:39:13 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
rahul shukla 6af302fa95 Issue #1848 2019-12-13 17:06:32 +05:30
rahul shukla dade205e81 Issue #1808 2019-12-12 20:10:12 +05:30
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
Herbert Maschke ebcc66ab59 remove alkhachatryan/laravel-web-console 2019-11-25 08:02:55 +01:00
Alexey 81608be9fa Removed useless classes usages 2019-11-13 01:35:23 +04:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
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
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
Vivek 6ab2d5046c [Bug Fixed #1555: order refund export related issue resolved.] 2019-10-17 12:36:09 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
Jitendra Singh 04c93e2339
Merge pull request #1527 from prashant-webkul/development
Development
2019-09-26 17:07:16 +05:30
Prashant Singh f6ce3643c0 Fixed issue #1524 2019-09-26 16:45:44 +05:30
jitendra 1acf86acf8 Dashboard avg sale issue fixed 2019-09-24 12:35:18 +05:30
jitendra 6cf1879920 Dashboard sales calculation issue fixed 2019-09-23 15:26:21 +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 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
jitendra 3c5a2792e3 Removed configurable checks and deleted unwanted files 2019-09-04 16:23:05 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
jitendra eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
jitendra 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +05:30
Prashant Singh afafdfbfcd Fixed issue #1327 2019-08-20 16:48:11 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Jitendra Singh b7bc6344bb
Merge pull request #1313 from prashant-webkul/development
Development
2019-08-19 13:56:04 +05:30
Prashant Singh aca7b4c6c7 Catalog rule tie breaker content in progress 2019-08-17 20:18:39 +05:30
Jitendra Singh a8ff894d6c
Merge pull request #1310 from prashant-webkul/development
Fixed channel locale issue in cms datagrid
2019-08-17 15:49:18 +05:30