Commit Graph

1358 Commits

Author SHA1 Message Date
ghermans 79a78cc9c9 #2512 - Added more dutch translations 2020-02-20 13:27:01 +01:00
Glenn Hermans 416a7b849a 2512 - Added more dutch translations 2020-02-20 12:37:00 +01:00
Glenn Hermans d71d39208d 2512 - Removed static text and wrong translations 2020-02-20 12:36:13 +01:00
ghermans f45f83ab89 #2512 - Added more dutch translations 2020-02-20 09:59:27 +01:00
ghermans cb99ea652b #2512 - Started dutch translations 2020-02-20 04:08:19 +01:00
Jitendra Singh 07b3e3d76a
Merge pull request #2507 from prateek-webkul/master
issue #2470 fixed
2020-02-19 18:47:16 +05:30
Jitendra Singh a31fba56b1 Resolved conflicts 2020-02-19 17:23:18 +05:30
Jitendra Singh a72401dbba Improved attribute package code style 2020-02-19 17:09:17 +05:30
prateek srivastava 36f795f09a assets for production 2020-02-19 16:25:40 +05:30
Vivek Sharma 20b7d78359 [Updated: resolved admin user delete issue.] 2020-02-19 16:22:19 +05:30
Jitendra Singh 99d506db94 Improved admin package code standard 2020-02-19 15:56:44 +05:30
Jitendra Singh b4c68c7f0b Improved datagrid code 2020-02-19 15:44:27 +05:30
prateek srivastava 6052b6355d Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-19 15:42:35 +05:30
prateek srivastava 74251ef2d2 issue 2470 fixed 2020-02-19 15:42:00 +05:30
rahul shukla 6133f84690 Product quantitity in datagrid 2020-02-19 11:53:14 +05:30
rahulshukla-webkul 5bfe263e10
Revert "add improvements to locale determination on product creation" 2020-02-18 18:14:22 +05:30
Jitendra Singh 7d161e31ef
Merge pull request #2373 from Haendlerbund/locale-improvements
add improvements to locale determination on product creation
2020-02-18 15:10:14 +05:30
Herbert Maschke b0e37edd63 only send emails when configured so 2020-02-17 16:52:58 +01:00
Herbert Maschke 5cbbf7c4f6 add english i18n strings for email notification setup 2020-02-17 16:35:31 +01:00
Herbert Maschke a889b1f31f add mail notification defaults (everything true) to Config/system.php 2020-02-17 16:25:14 +01:00
Jitendra Singh 881027ca4e Converted configuration boolean type to switch 2020-02-12 13:45:26 +05:30
Jitendra Singh 300feaec0f Converted checkbox into switch 2020-02-11 17:56:25 +05:30
Jitendra Singh 0caa8010d2 Issue #2424 fixed 2020-02-11 16:37:10 +05:30
Herbert Maschke c27b70b420 load correct locale in CategoryController.php 2020-02-10 15:21:03 +01:00
Herbert Maschke d574ab1beb Merge branch 'bagisto/master' into locale-improvements 2020-02-10 15:11:43 +01:00
Herbert Maschke 45160d2099 fix some javascript i have destroyed previously accidentally 2020-02-10 15:07:14 +01:00
Herbert Maschke 38dbb6384d obey the default channel and configured default locale in product edit form 2020-02-10 15:05:03 +01:00
Steffen Mahler 59f1956a21 merge bagisto/master into fix-tax-handling 2020-02-08 20:48:27 +01:00
Jitendra Singh 3c11496274
Merge pull request #2351 from aayush-webkul/master
Added old() function in Admin and Shop package
2020-02-07 15:53:24 +05:30
shaiv-webkul f47f06de31 #2180 fixed 2020-02-07 15:48:20 +05:30
shaiv-webkul d43efc505a Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-07 15:29:52 +05:30
Steffen Mahler b94fc9fc8c merge master and resolve conflicts 2020-02-07 10:44:04 +01:00
rahul shukla 40517df331 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-07 13:49:15 +05:30
rahul shukla 0358a84a2c Issue #2357 2020-02-07 13:49:01 +05:30
shaiv-webkul 13047f266f Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-07 13:24:16 +05:30
Jitendra Singh e94d1ad146
Merge pull request #2365 from jitendra-webkul/1.0
Issue #1977 fixed
2020-02-07 13:19:55 +05:30
Jitendra Singh e517d66e71 Issue #1977 fixed 2020-02-07 13:18:48 +05:30
shaiv-webkul 3516322e1f #2180 issue fixed 2020-02-07 13:10:03 +05:30
Jitendra Singh e8b34451ed
Merge pull request #2361 from jitendra-webkul/1.0
Issue #1977 fixed
2020-02-07 12:57:04 +05:30
Jitendra Singh cc5df27870 Issue #1977 fixed 2020-02-07 12:56:18 +05:30
Aayush Bhatt 7fc6fd7d3d old() function implimented in admin and shop package 2020-02-06 22:04:33 +05:30
Aayush Bhatt 75ef8f9b54 Duplicate old() function removed 2020-02-06 20:23:56 +05:30
Aayush Bhatt d9f2f1ab3d Duplicate old() functioon fixed and working in admin panel 2020-02-06 20:07:26 +05:30
Aayush Bhatt 2a0d461d9e old() function implemented in admin package 2020-02-06 18:52:10 +05:30
Jitendra Singh e18027c612
Merge pull request #2332 from jitendra-webkul/1.0
Issue #2126 fixed
2020-02-06 17:13:13 +05:30
Jitendra Singh 9f80cff693 Issue #2126 fixed 2020-02-06 17:12:41 +05:30
rahul shukla 0bd6096e26 Issue #2189 2020-02-06 15:57:31 +05:30
Aayush Bhatt ff1e315fc7 Admin dropdown UI fixed 2020-02-06 12:26:35 +05:30
Aayush Bhatt 0694fbd7eb Issue #2189 resolved 2020-02-06 11:59:45 +05:30
Aayush Bhatt 28a4aaa5ac Bug fixed 2020-02-06 11:57:53 +05:30
Jitendra Singh 47b010ce6b
Merge pull request #2296 from jitendra-webkul/1.0
Issue #2295 fixed
2020-02-05 19:39:58 +05:30
Jitendra Singh 9f86e4fcca Issue #2295 fixed 2020-02-05 19:38:52 +05:30
Jitendra Singh 98390b2ce7
Merge pull request #2291 from jitendra-webkul/1.0
Issue #1267 fixed
2020-02-05 18:59:46 +05:30
Jitendra Singh 4ef21c827a Issue #1267 fixed 2020-02-05 18:53:57 +05:30
MonaHartdegen b0946ef97d added ids to sections in accordians/downloadable.blade.php 2020-02-05 13:23:50 +01:00
rahul shukla 16e4a109ea Configurtion form validation improvement 2020-02-05 16:07:00 +05:30
rahul shukla ff37467e70 Issue #2239 2020-02-05 12:06:16 +05:30
rahul shukla a2d642f35d revert tpye 2020-02-05 11:32:29 +05:30
rahul shukla 1b5b47fc80 Issue #2269 2020-02-05 11:29:57 +05:30
rahul shukla 832e66025e Issue #2270 2020-02-05 11:14:45 +05:30
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler 0d6aee18e4 merge remote-tracking branch 'bagisto/master' into fix-tax-handling 2020-02-04 17:55:53 +01:00
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Steffen Mahler 7c661efd88 add unit tests, refactoring 2020-02-04 11:18:40 +01:00
Steffen Mahler cb5e3a47f6 fix tax handling, add functional cest for cart 2020-02-04 08:50:37 +01:00
Jitendra Singh 453908a768
Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
add ability to provide company_name in address during checkout
2020-02-04 11:40:39 +05:30
Jitendra Singh 9246311fa8
Merge pull request #2236 from rahulshukla-webkul/development
Issue #2227
2020-02-04 11:39:20 +05:30
Jitendra Singh 749b23924a
Merge pull request #2238 from jitendra-webkul/1.0
Issue #2237 fixed
2020-02-04 11:25:20 +05:30
Jitendra Singh 8f2d1779ee Issue #2237 fixed 2020-02-04 11:20:22 +05:30
rahul shukla f624f45a4a Issue #1976 2020-02-03 19:14:26 +05:30
Jitendra Singh d6fd342341
Merge pull request #2228 from mohdfaizdev/2225
Fixed issue 2225
2020-02-03 13:51:20 +05:30
Jitendra Singh b4f4fc5529 Issue #2182 fixed 2020-02-03 13:14:11 +05:30
Jitendra Singh 6560e13045 Resolved conflict 2020-02-03 13:03:32 +05:30
Jitendra Singh fa3c5deac6 Issue #2203 fixed 2020-02-03 13:01:54 +05:30
Mohd Faiz 970d05c1c4 Fixed issue 2225 2020-02-03 12:22:04 +05:30
Steffen Mahler 8abce3302a tax helper introduced, views changed to display multiple tax rates 2020-01-31 16:08:01 +01:00
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
rahul shukla 7fdf5b66ab Issue #2173 2020-01-31 13:31:38 +05:30
rahul shukla c64bb4f85b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-31 13:19:00 +05:30
rahul shukla 6565f25153 Issue #2182 2020-01-31 13:18:40 +05:30
Jitendra Singh 3c16599ddb
Merge pull request #2211 from Haendlerbund/add-channel-and-locale-filter-to-product-grid
Add channel and locale filter to product grid
2020-01-31 12:03:59 +05:30
Herbert Maschke 76b58e9bd8 some first_name and last_name input fields 2020-01-31 05:59:12 +01:00
Florian Bosdorff 389b40fdce Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid 2020-01-30 16:04:57 +01:00
rahul shukla ebab486fc1 merge with master 2020-01-30 16:21:00 +05:30
rahul shukla b40c2173a8 Issue #2204 2020-01-30 15:22:39 +05:30
Steffen Mahler 8b196c9c9c merge remote-tracking branch 'bagisto/master' into fix-tax-handling 2020-01-29 14:12:43 +01:00
rahul shukla 3ac48ee883 Issue #2192 2020-01-29 18:27:47 +05:30
rahul shukla a5853bb030 Issue #2198 2020-01-29 16:09:49 +05:30
rahul shukla 97332a1fc3 Issue #2192 2020-01-29 16:06:56 +05:30
rahul shukla 906366b6d4 Issue #2192 2020-01-29 13:48:31 +05:30
rahul shukla 50c6970c74 #Issue 2190 2020-01-29 13:32:16 +05:30
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +01:00
rahul shukla a71cc1c887 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-28 19:08:08 +05:30
Jitendra Singh 9ccc8b26c5
Merge pull request #2187 from jitendra-webkul/1.0
Issue #2182 fixed
2020-01-28 19:03:14 +05:30
rahul shukla ff52bc6708 change log updated and Issue #2182 2020-01-28 18:09:22 +05:30
rahul shukla 016c3a0ea7 change log updated and Issue #2182 2020-01-28 18:07:48 +05:30
Jitendra Singh 2e6d7aff95 Issue #2182 fixed 2020-01-28 18:01:10 +05:30
Jitendra Singh ee7a68ba77
Merge pull request #2184 from jitendra-webkul/1.0
Issue #2183 fixed
2020-01-28 17:44:54 +05:30
Jitendra Singh 96b607d5f6 Issue #2183 fixed 2020-01-28 17:40:48 +05:30
Jitendra Singh 321dc84a91
Merge pull request #2179 from jitendra-webkul/1.0
Shipping discount issue fixed during refund creation
2020-01-28 17:37:20 +05:30