47b010ce6b
Merge pull request #2296 from jitendra-webkul/1.0
...
Issue #2295 fixed
2020-02-05 19:39:58 +05:30
9f86e4fcca
Issue #2295 fixed
2020-02-05 19:38:52 +05:30
98390b2ce7
Merge pull request #2291 from jitendra-webkul/1.0
...
Issue #1267 fixed
2020-02-05 18:59:46 +05:30
4ef21c827a
Issue #1267 fixed
2020-02-05 18:53:57 +05:30
b0946ef97d
added ids to sections in accordians/downloadable.blade.php
2020-02-05 13:23:50 +01:00
16e4a109ea
Configurtion form validation improvement
2020-02-05 16:07:00 +05:30
ff37467e70
Issue #2239
2020-02-05 12:06:16 +05:30
a2d642f35d
revert tpye
2020-02-05 11:32:29 +05:30
1b5b47fc80
Issue #2269
2020-02-05 11:29:57 +05:30
832e66025e
Issue #2270
2020-02-05 11:14:45 +05:30
ae467fc182
merge master, refactoring tests
2020-02-04 18:13:09 +01:00
0d6aee18e4
merge remote-tracking branch 'bagisto/master' into fix-tax-handling
2020-02-04 17:55:53 +01:00
53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring
2020-02-04 14:08:46 +01:00
7c661efd88
add unit tests, refactoring
2020-02-04 11:18:40 +01:00
cb5e3a47f6
fix tax handling, add functional cest for cart
2020-02-04 08:50:37 +01:00
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
9246311fa8
Merge pull request #2236 from rahulshukla-webkul/development
...
Issue #2227
2020-02-04 11:39:20 +05:30
749b23924a
Merge pull request #2238 from jitendra-webkul/1.0
...
Issue #2237 fixed
2020-02-04 11:25:20 +05:30
8f2d1779ee
Issue #2237 fixed
2020-02-04 11:20:22 +05:30
f624f45a4a
Issue #1976
2020-02-03 19:14:26 +05:30
d6fd342341
Merge pull request #2228 from mohdfaizdev/2225
...
Fixed issue 2225
2020-02-03 13:51:20 +05:30
b4f4fc5529
Issue #2182 fixed
2020-02-03 13:14:11 +05:30
6560e13045
Resolved conflict
2020-02-03 13:03:32 +05:30
fa3c5deac6
Issue #2203 fixed
2020-02-03 13:01:54 +05:30
970d05c1c4
Fixed issue 2225
2020-02-03 12:22:04 +05:30
8abce3302a
tax helper introduced, views changed to display multiple tax rates
2020-01-31 16:08:01 +01:00
e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring
2020-01-31 09:41:58 +01:00
7fdf5b66ab
Issue #2173
2020-01-31 13:31:38 +05:30
c64bb4f85b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-01-31 13:19:00 +05:30
6565f25153
Issue #2182
2020-01-31 13:18:40 +05:30
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
76b58e9bd8
some first_name and last_name input fields
2020-01-31 05:59:12 +01:00
389b40fdce
Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid
2020-01-30 16:04:57 +01:00
ebab486fc1
merge with master
2020-01-30 16:21:00 +05:30
b40c2173a8
Issue #2204
2020-01-30 15:22:39 +05:30
8b196c9c9c
merge remote-tracking branch 'bagisto/master' into fix-tax-handling
2020-01-29 14:12:43 +01:00
3ac48ee883
Issue #2192
2020-01-29 18:27:47 +05:30
a5853bb030
Issue #2198
2020-01-29 16:09:49 +05:30
97332a1fc3
Issue #2192
2020-01-29 16:06:56 +05:30
906366b6d4
Issue #2192
2020-01-29 13:48:31 +05:30
50c6970c74
#Issue 2190
2020-01-29 13:32:16 +05:30
0d696c6b1a
merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring
2020-01-28 15:51:50 +01:00
a71cc1c887
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-01-28 19:08:08 +05:30
9ccc8b26c5
Merge pull request #2187 from jitendra-webkul/1.0
...
Issue #2182 fixed
2020-01-28 19:03:14 +05:30
ff52bc6708
change log updated and Issue #2182
2020-01-28 18:09:22 +05:30
016c3a0ea7
change log updated and Issue #2182
2020-01-28 18:07:48 +05:30
2e6d7aff95
Issue #2182 fixed
2020-01-28 18:01:10 +05:30
ee7a68ba77
Merge pull request #2184 from jitendra-webkul/1.0
...
Issue #2183 fixed
2020-01-28 17:44:54 +05:30
96b607d5f6
Issue #2183 fixed
2020-01-28 17:40:48 +05:30
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
efc4a6b8c3
Issue #2177 fixed
2020-01-28 17:33:08 +05:30
7cf72f16fe
Issue #2177 fixed
2020-01-28 17:28:58 +05:30
4b376b5ed7
Merge pull request #2027 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
...
Introduce optional company name and sales tax id columns to customer addresses
2020-01-28 17:00:36 +05:30
c75e4a0042
Merge pull request #2174 from jitendra-webkul/1.0
...
Issue #2173 fixed
2020-01-28 15:19:39 +05:30
c9769717d0
Issue #2173 fixed
2020-01-28 15:18:51 +05:30
7a77cf380a
Merge pull request #2169 from jitendra-webkul/1.0
...
Issue #2168 fixed
2020-01-28 13:58:29 +05:30
64fd205298
Issue #2168 fixed
2020-01-28 13:47:44 +05:30
ed2de87d06
Merge pull request #2166 from jitendra-webkul/1.0
...
Issues #1189 , #1148 fixed
2020-01-28 13:24:03 +05:30
7b32b2e516
Issues #1189 , #1148 fixed
2020-01-28 13:18:30 +05:30
5188b1b7f9
Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-28 08:15:11 +01:00
bf53dd49f3
remove unused use statement
2020-01-27 17:25:37 +01:00
d125f9eba0
add reporting for try-catch-sections
2020-01-27 17:06:03 +01:00
20c2232710
remove |alpha_spaces validation from customer addresses city
2020-01-27 12:00:25 +01:00
511d812333
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-27 11:40:18 +01:00
cbaebaa388
query optimization and hide of expose model
2020-01-25 17:00:31 +05:30
e948b30e35
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-24 15:13:16 +01:00
f80109ba8b
Issue #2124 fixed
2020-01-24 16:11:17 +05:30
ccc2188ef1
merge bagisto master
2020-01-24 10:22:15 +01:00
f6834b5196
Merge branch 'master' into new-bagisto-master
2020-01-24 10:16:11 +01:00
4a38df3279
Fixed letter case issue in translation
2020-01-24 14:04:29 +05:30
d1ab679e3e
Issue #2128 fixed
2020-01-24 13:54:54 +05:30
d5c0891055
Issue #2128 fixed
2020-01-24 13:50:40 +05:30
5ebb67dd81
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-23 14:18:17 +01:00
da4980bfbe
Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration
...
Issue 1183/guest checkout configuration
2020-01-23 11:51:08 +05:30
4629a3bb0f
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-22 14:59:18 +01:00
0337959327
merge conflicts
2020-01-22 18:50:01 +05:30
01f0fc9a57
2089 and updated codeception dependencies
2020-01-22 18:44:53 +05:30
80a2ddb88d
Issue #1397 fixed
2020-01-22 14:58:39 +05:30
61d9b59e5f
Merge master into issue-1183/guest-checkout-configuration
2020-01-22 08:10:45 +01:00
8bd9f0bc9d
Revert "Resolve #1183 guest checkout configuration"
2020-01-22 11:58:56 +05:30
3aec5047f6
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
...
Resolve #1183 guest checkout configuration
2020-01-22 11:32:45 +05:30
4596a77c07
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-21 11:36:26 +01:00
e3db0b164c
conflict resolve
2020-01-21 13:24:19 +05:30
176feecb55
Resolved conflicts
2020-01-20 19:59:04 +05:30
b18f2292c4
Issue #2071 fixed
2020-01-20 19:57:10 +05:30
132dd6c0f0
introduce guest checkout configuration
2020-01-17 14:42:47 +01:00
8612bd1385
Merge pull request #2069 from jitendra-webkul/1.0
...
Fixed cms textarea field issue
2020-01-17 14:58:27 +05:30
6535afb52c
Fixed cms textarea field issue
2020-01-17 14:57:36 +05:30
a6960f2916
Merge pull request #2068 from jitendra-webkul/1.0
...
Removed Developement menu
2020-01-17 14:49:25 +05:30
eb3fdc12c6
Removed Developement menu
2020-01-17 14:48:39 +05:30
880868738a
Merge pull request #2067 from jitendra-webkul/1.0
...
Issue #2058 fixed
2020-01-17 12:06:06 +05:30
7d7e86e85c
Issue #2058 fixed
2020-01-17 12:05:28 +05:30
976d19cd74
Merge Bagisto master into Haendlerbund/Bagisto master ( #14 )
...
* added bagisto:install command
* updates for uploading attachments
* Issue #1808
* Issue #1779 fixed
* Issue #2045
* Issue #1971
* Issue #1779 fixed
* fire event on creating/updating slider
* Issue #1863 fixed
* Issue #1863 fixed
* Removed ')' in page edit blade
* Issue #2054 fixed
* Issue #2054 fixed
* Added mail from name field in .env.example file, Issue #2051
Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-16 13:54:18 +01:00
0468b7fa58
pass locale data in view_render_event
2020-01-16 12:37:52 +05:30
e0c2814f2e
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-15 15:29:55 +01:00
3ab9b62028
add vat_id to AddressDataGrid.php
2020-01-15 14:17:13 +01:00
d80a3c7a5f
Merge pull request #2059 from jitendra-webkul/1.0
...
Removed ')' in page edit blade
2020-01-15 18:42:24 +05:30
b552aba450
Removed ')' in page edit blade
2020-01-15 18:40:57 +05:30
57aa522282
introduce company_name and vat_id also in shop admin backend
2020-01-15 14:02:51 +01:00
915213711d
Merge pull request #2057 from jitendra-webkul/1.0
...
Issue #1863 fixed
2020-01-15 17:46:03 +05:30
1e73cc9bc8
Issue #1863 fixed
2020-01-15 17:45:15 +05:30
2049c45b0f
Merge pull request #2056 from jitendra-webkul/1.0
...
Issue #1863 fixed
2020-01-15 17:09:20 +05:30
b4319e1f38
Issue #1863 fixed
2020-01-15 17:08:37 +05:30
a7fe03602f
Merge pull request #2049 from rahulshukla-webkul/development
...
Issue #1971
2020-01-14 17:08:17 +05:30
84feea8f0d
Issue #1971
2020-01-14 17:04:53 +05:30
9524c78ad5
various code style improvements
2020-01-14 10:49:22 +01:00
0e2b8163e6
Merge pull request #2047 from jitendra-webkul/1.0
...
Issue #1779 fixed
2020-01-14 13:24:26 +05:30
05a619d39b
Issue #1779 fixed
2020-01-14 13:23:49 +05:30
7110804889
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-01-14 12:37:18 +05:30
7e1b5fa693
Issue #1808
2020-01-14 12:37:03 +05:30
4381d54029
added blank lines to improve readability
2020-01-13 17:05:32 +01:00
6e757413bf
Merge branch 'master' into merge-bagisto-master
2020-01-13 17:01:51 +01:00
d225ddf04a
added channel and locale to dropdown to product data grid
2020-01-13 16:50:28 +01:00
2cf8af4815
updates for uploading attachments
2020-01-13 19:38:04 +05:30
5ce709d31a
Merge pull request #2028 from rahulshukla-webkul/development
...
Issue #1808
2020-01-10 16:57:49 +05:30
6d6efbb49c
Issue #1808
2020-01-10 16:50:20 +05:30
9faef742d7
Issue #1845 fixed
2020-01-10 13:53:11 +05:30
0f0cc82058
Issue #1983
2020-01-09 13:39:13 +05:30
6413cdae71
added star in state view in datagrid
2020-01-09 13:07:43 +05:30
55df0ad02f
Merge pull request #2013 from jitendra-webkul/1.0
...
Issues #1997 , #1994 fixed
2020-01-08 17:02:39 +05:30
ca0f8bca49
Issues #1997 , #1994 fixed
2020-01-08 17:01:50 +05:30
a0c02e6c4a
Merge pull request #2011 from jitendra-webkul/1.0
...
Tax rates for all states
2020-01-07 19:37:42 +05:30
fbfd710f1c
Tax rates for all states
2020-01-07 17:48:43 +05:30
ebddf578b1
Merge pull request #1843 from Haendlerbund/feature/update-npm-assets
...
update npm assets
2020-01-07 15:34:29 +05:30
d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
...
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
7f3e3001b5
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-01-03 18:05:24 +05:30
97c63ad035
review missing variavle and admin footer text
2020-01-03 18:05:14 +05:30
25dff89054
translation added for locales
2020-01-03 16:12:23 +05:30
9b120a978d
foter text change
2020-01-03 15:57:43 +05:30
297165859f
foter text change
2020-01-03 15:35:56 +05:30
9fda68d597
merge bagisto master 7b1378f ( #10 )
...
* added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view
* added attribute (-related) factories; added functional test
* improved usage of var/let/const; fixed error on removing row
* Allow datagrid action to have target="_blank"
* The {length} didn't get properly formatted
I don't know if this is completely correct since I don't know this language, but for my language it said
```
Veld "Wachtwoord" moet ten minste {length} tekens bevatten
```
So the length didn't get replaced.
I think the locales.js needs to change
* Multiple type file error
* add two events to profile index blade view
* throw exception when session user is not available on product review page
* check guest customer configuration
* Issue #1879 and #1880
* Issue 1802.
* Issue #1792
* increase maintainability by replacing hard coded class names by <Classname>::class in ProductRepository
* Issue #1806
* fix: broken url sometimes when finishing installation,go to wrong application url
Co-authored-by: hb-monah <58027155+hb-monah@users.noreply.github.com>
Co-authored-by: Hans Schouten <account@emailo.nl>
Co-authored-by: KevinLaveto <31034266+KevinLaveto@users.noreply.github.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-02 15:46:16 +01:00
4b2088e66e
upgrade to laravel 6
2019-12-30 17:10:38 +05:30
af28c35bf7
Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets
2019-12-30 09:32:49 +01:00
7aba45486f
Indexes created for all product types
2019-12-25 19:57:05 +05:30
23a15be1e0
compatible with laravel 5.8
2019-12-24 19:31:13 +05:30
a3aa23fcbc
Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes
...
Allow empty option for attributes
2019-12-24 13:12:22 +05:30
795561ea58
Made all changes for discount packages
2019-12-21 16:00:22 +05:30
2d0b26d78a
Added changes on core packages for discount
2019-12-21 13:01:16 +05:30
2380c1b597
Merged with master
2019-12-21 10:58:46 +05:30
513b07e4cf
Added new cart rule and catalog rule
2019-12-21 10:55:32 +05:30
642d99a63c
Issue #1792
2019-12-19 17:42:12 +05:30
2f0338bda3
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-12-19 16:47:20 +05:30
10d4613446
Issue #1879 and #1880
2019-12-19 16:47:00 +05:30
02d42d6186
Multiple type file error
2019-12-18 11:18:57 +01:00
d92bb0ea72
Merge branch 'bagisto/master' into feature/update-npm-assets
2019-12-18 09:41:40 +01:00
c26bf6c820
Merge pull request #1701 from MattApril/env-fix
...
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
b033901678
Issue #1897 , added configuartion for live account in paypal
2019-12-18 11:42:07 +05:30
5d9923bf30
improved usage of var/let/const; fixed error on removing row
2019-12-16 15:42:32 +01:00
2f8e319fb0
Issue #1232 , default item in perpage and label of perpage
2019-12-16 18:56:02 +05:30
2b0385c14e
Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes
2019-12-13 14:12:14 +01:00
Jitendra Singh
Jitendra Singh
MonaHartdegen
rahul shukla
Steffen Mahler
Annika Wolff
Mohd Faiz
Herbert Maschke
Florian Bosdorff
Florian Bosdorff
hb-monah
rahulshukla-webkul
Annika Wolff
shubhammehrotra.symfony@webkul.com
David Große
peternuernberger
KevinLaveto