Commit Graph

1186 Commits

Author SHA1 Message Date
rahul shukla 570ce2610d Change validation way in vat_id 2020-02-06 12:08:27 +05:30
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +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
rahul shukla 7ea4c4219c Issue #2227 2020-02-03 18:57:50 +05:30
rahul shukla 9a9400fe23 Issue #2219 2020-02-03 17:01:23 +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
Herbert Maschke 76b58e9bd8 some first_name and last_name input fields 2020-01-31 05:59:12 +01:00
Herbert Maschke 6be3d086f8 add ability to provide company_name in address during checkout (optional) 2020-01-30 20:56:01 +01:00
Steffen Mahler d3e00d4543 add functional test for cart, fix tests with usage of 2020-01-28 16:28:29 +01:00
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +01:00
Steffen Mahler 14c0276fce update cart button is not shown, when only products without quantity box are in cart, tests added 2020-01-28 15:38:07 +01:00
rahul shukla 434b681962 Issue #2186 2020-01-28 19:09:15 +05:30
Jitendra Singh 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
Jitendra Singh 7293716b1b
Merge pull request #2170 from rahulshukla-webkul/development
Issue #742 and #2165
2020-01-28 15:02:47 +05:30
rahul shukla 3144720c48 Issue #742 and #2165 2020-01-28 14:56:05 +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
Steffen Mahler 223c96b205 . 2020-01-27 13:06:31 +01:00
Jitendra Singh b8115c808e
Merge pull request #2144 from Haendlerbund/trigger-db-prefixes
fix trigger according to optional db-prefix
2020-01-27 17:21:26 +05:30
Jitendra Singh 0b3a7a6c6a
Merge pull request #2157 from jitendra-webkul/1.0
Removed commented code
2020-01-27 16:52:08 +05:30
Jitendra Singh 8176317a59 Removed commented code 2020-01-27 16:46:58 +05:30
Jitendra Singh 3e2e6f2c75
Merge pull request #2156 from jitendra-webkul/1.0
Issue #2087 fixed
2020-01-27 16:42:01 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
Herbert Maschke 511d812333 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-27 11:40:18 +01:00
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
Florian Bosdorff d2a8911aaa fix trigger according to optional db-prefix 2020-01-26 21:10:57 +01:00
Steffen Mahler a5c49e4b76 button 'update cart' will only be shown if corresponding products are in cart 2020-01-24 07:15:49 +01:00
Herbert Maschke 5ebb67dd81 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-23 14:18:17 +01:00
rahul shukla 2c0b7e4e54 try and catch in password section and wishlist add remove 2020-01-23 15:32:06 +05:30
Jitendra Singh 956259cc32
Merge pull request #2123 from rahulshukla-webkul/development
Issue #2087
2020-01-23 11:51:19 +05:30
Jitendra Singh 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
rahul shukla 2d8f5f412e Issue #2087 2020-01-23 10:42:09 +05:30
Herbert Maschke 4629a3bb0f Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-22 14:59:18 +01:00
rahul shukla 01f0fc9a57 2089 and updated codeception dependencies 2020-01-22 18:44:53 +05:30
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
Herbert Maschke 8d1d03d25b Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 13:44:09 +01:00
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
2020-01-21 16:34:38 +05:30
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 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 176feecb55 Resolved conflicts 2020-01-20 19:59:04 +05:30
Jitendra Singh b18f2292c4 Issue #2071 fixed 2020-01-20 19:57:10 +05:30
Jitendra Singh dfa4272cf2
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots
Set correct category url_path in multiple root categories environment
2020-01-20 13:27:04 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Herbert Maschke 7c9908401f improve the way server side validation errors are being displayed 2020-01-17 12:54:02 +01:00
Jitendra Singh 880868738a
Merge pull request #2067 from jitendra-webkul/1.0
Issue #2058 fixed
2020-01-17 12:06:06 +05:30
Jitendra Singh 7d7e86e85c Issue #2058 fixed 2020-01-17 12:05:28 +05:30
Annika Wolff 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
Herbert Maschke e0c2814f2e Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-15 15:29:55 +01:00
Jitendra Singh ab8001d20c
Merge pull request #2062 from jitendra-webkul/1.0
Issue #2054 fixed
2020-01-15 19:08:54 +05:30
Jitendra Singh 130ed41044 Issue #2054 fixed 2020-01-15 19:07:12 +05:30
Jitendra Singh d80a3c7a5f
Merge pull request #2059 from jitendra-webkul/1.0
Removed ')' in page edit blade
2020-01-15 18:42:24 +05:30
Jitendra Singh b552aba450 Removed ')' in page edit blade 2020-01-15 18:40:57 +05:30
Annika Wolff 91d6586ad8 resolve exception, rename function haveDownloadableItems 2020-01-15 11:53:48 +01:00
Annika Wolff a75f3dab51 resolve conflicts 2020-01-15 11:37:38 +01:00
David Große e0b0740a83 typo: s/formi/form 2020-01-14 13:07:49 +01:00
Jitendra Singh 3901c1ad2e
Merge pull request #2048 from rahulshukla-webkul/development
Issue #2045
2020-01-14 15:27:47 +05:30
rahul shukla 9c7770b29e Issue #2045 2020-01-14 15:25:04 +05:30
David Große 72c3e289c7 remove the splitting into first_name and last_name again - it can be desastrous to drop a column in a productive environment 2020-01-14 10:25:26 +01:00
Jitendra Singh 0e2b8163e6
Merge pull request #2047 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-14 13:24:26 +05:30
Jitendra Singh 05a619d39b Issue #1779 fixed 2020-01-14 13:23:49 +05:30
David Große 7eee7e3134 split the 'name' column in the customer addresses into 'first_name' and 'last_name' - it is more common to save the data in this structure 2020-01-13 11:20:04 +01:00
Jitendra Singh a42724d5f3
Merge pull request #2038 from jitendra-webkul/1.0
Issue #1795 fixed
2020-01-13 13:18:25 +05:30
Jitendra Singh 3368eb5ba5 Issue #1795 fixed 2020-01-13 13:17:27 +05:30
Jitendra Singh 1e18cebb00
Merge pull request #2037 from jitendra-webkul/1.0
Issue #1764 fixed
2020-01-13 12:45:25 +05:30
Jitendra Singh cf36d252a0 Issue #1764 fixed 2020-01-13 12:44:36 +05:30
Jitendra Singh 9380a37479
Merge pull request #2036 from jitendra-webkul/1.0
Issue #1786 fixed
2020-01-13 12:38:30 +05:30
Jitendra Singh 27e728d54e Issue #1786 fixed 2020-01-13 12:37:41 +05:30
David Große 24f6fb2290 display server side errors 2020-01-10 14:20:47 +01:00
David Große 109b503609 display vat_id and company_name in edit.blade.php 2020-01-10 14:16:34 +01:00
David Große 7429d32072 introduce VatValidator.php 2020-01-10 14:07:58 +01:00
David Große 98632b0de8 remove required html classes 2020-01-10 13:24:33 +01:00
David Große 3af9a825c9 add optional vat_id to customer addresses 2020-01-10 11:59:53 +01:00
Jitendra Singh 9d1887a9a1
Merge pull request #2026 from jitendra-webkul/1.0
Issue #1804 fixed
2020-01-10 16:28:27 +05:30
Jitendra Singh a7d02d552f Issue #1804 fixed 2020-01-10 16:27:35 +05:30
Jitendra Singh 30cb75c307
Merge pull request #2024 from jitendra-webkul/1.0
Issue #1821 fixed
2020-01-10 15:48:53 +05:30
David Große 3ca5c99f27 introduce company_name column to customer_addresses 2020-01-10 11:05:09 +01:00
Jitendra Singh 9fbe756075 Fixed review controller compact undefined variable issue 2020-01-10 15:14:29 +05:30
Jitendra Singh 01833962a9
Merge pull request #2023 from jitendra-webkul/1.0
Issue #1842 fixed
2020-01-10 14:05:25 +05:30
Jitendra Singh 8db495446a Issue #1842 fixed 2020-01-10 14:00:11 +05:30
Jitendra Singh a8d8580f89
Merge pull request #2022 from jitendra-webkul/1.0
Issue #1845 fixed
2020-01-10 13:54:04 +05:30
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
Jitendra Singh 3a52d63ac9
Merge pull request #1985 from rabol/master
Make it possible to specify timezone in .env
2020-01-10 13:32:30 +05:30
rahul shukla b5b00bb4f8 Issue 2012 2020-01-09 11:33:54 +05:30
Jitendra Singh ebddf578b1
Merge pull request #1843 from Haendlerbund/feature/update-npm-assets
update npm assets
2020-01-07 15:34:29 +05:30
MonaHartdegen c065631a58 set correct category url_path in multiple root categories environment 2020-01-06 15:37:55 +01:00
Jitendra Singh 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
MonaHartdegen f4499b4728 altered trigger to be compatible with multi root categories environment; tests still WIP 2020-01-03 15:22:09 +01:00
Jitendra Singh ab5464641b
Merge pull request #2003 from Haendlerbund/make-api-routes-accessable
Make API routes accessable
2020-01-03 18:08:20 +05:30
rahul shukla 7f3e3001b5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-03 18:05:24 +05:30
rahul shukla 97c63ad035 review missing variavle and admin footer text 2020-01-03 18:05:14 +05:30
MonaHartdegen d52ef533c7 replace wildcard route for products and categories with fallback route 2020-01-03 13:09:06 +01:00
rahul shukla 9b120a978d foter text change 2020-01-03 15:57:43 +05:30
rahul shukla 297165859f foter text change 2020-01-03 15:35:56 +05:30
MonaHartdegen dc89cd6511 fixed product links in two views (replaced hard coded link with route) 2020-01-02 13:14:53 +01:00
peternuernberger af28c35bf7 Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets 2019-12-30 09:32:49 +01:00
rabol 029971e9cf Fix bug that prevent user from signing up for newsletter 2019-12-28 15:36:40 +01:00
Annika Wolff d47201af75 bugfixed quantity update when showQuantityBox is false 2019-12-27 14:41:32 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
Jitendra Singh 3b1b3e819f
Merge pull request #1945 from rahulshukla-webkul/development
Development
2019-12-24 13:12:52 +05:30
Jitendra Singh 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
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
jitendra 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 2d0b26d78a Added changes on core packages for discount 2019-12-21 13:01:16 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
rahul shukla 370480572f Issue 1802. 2019-12-19 17:21:40 +05:30
shubhammehrotra.symfony@webkul.com 992d09e8d5 check guest customer configuration 2019-12-19 16:04:55 +05:30
shubhammehrotra.symfony@webkul.com cf837ba290 throw exception when session user is not available on product review page 2019-12-19 15:53:01 +05:30
Jitendra Singh d74e8e863c
Merge pull request #1907 from KevinLaveto/patch-1
The {length} didn't get properly formatted
2019-12-19 12:53:50 +05:30
David Große d667263313 add two events to profile index blade view 2019-12-18 16:26:38 +01:00
KevinLaveto 37ca3d6586
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
2019-12-18 10:16:35 +01:00
peternuernberger d92bb0ea72 Merge branch 'bagisto/master' into feature/update-npm-assets 2019-12-18 09:41:40 +01:00
Jitendra Singh 068b688e7c
Merge pull request #1785 from Haendlerbund/1244-url-structure-for-products-and-categories
1244 url structure for products and categories (SEO improvements)
2019-12-18 12:38:53 +05:30
Jitendra Singh 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
rahul shukla 2f8e319fb0 Issue #1232, default item in perpage and label of perpage 2019-12-16 18:56:02 +05:30
MonaHartdegen 2b0385c14e Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes 2019-12-13 14:12:14 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla 7321a2fc74 Issue #1821, price at review page 2019-12-12 19:44:54 +05:30
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
rahul shukla e8f0802b9f Issue #1878 2019-12-12 15:23:30 +05:30
MonaHartdegen 7b1378fded added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view 2019-12-12 10:32:51 +01:00
rahul shukla c6553ed238 conflict resolve 2019-12-12 14:20:17 +05:30
rahul shukla dbf404d13f Issue #1787 2019-12-11 15:25:19 +05:30
MonaHartdegen ebcae41f3c improved field size of url_path in DB, improved naming, update url_path of children on saving 2019-12-09 08:22:37 +01:00
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
MonaHartdegen 0eb9cfc86d added comment to db column; added @property-read to Category and CategoryTranslation model 2019-12-03 13:24:11 +01:00
MonaHartdegen 78a3c91c84 fixed bug in sql triggers 2019-12-02 16:30:24 +01:00
peternuernberger 57750b3864 prevent script break if there are no products 2019-12-02 11:46:13 +01:00
peternuernberger c1f648a17f excluded import statements 2019-12-02 11:41:02 +01:00
rahul shukla 8948aeaea7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-11-26 18:33:01 +05:30
rahul shukla 79d9a1d9b3 dtabase prefix added in raw query 2019-11-26 16:06:22 +05:30
MonaHartdegen e57cd8e552 added numbers to regex for products and categories route 2019-11-25 14:22:49 +01:00
Jitendra Singh 840290f0bb
Merge pull request #1782 from Haendlerbund/introduce-product-type-helper
introduce ProductType Helper
2019-11-22 17:05:21 +05:30
Jitendra Singh 5e3b18a865
Merge pull request #1702 from MattApril/payment-labels
Minor usability/accessability fix for payment type labels
2019-11-22 16:35:22 +05:30
MonaHartdegen c57c5d9b6f altered nav-menu to show correct category urls 2019-11-22 11:37:55 +01:00
Mona Hartdegen 25c2a15b65 introduced url structure for categories and products (SEO improvements) 2019-11-21 17:14:53 +01:00
Annika Wolff 9a43776cc0 introduce ProductType Helper 2019-11-21 16:56:21 +01:00
Jitendra Singh 58a0bad4c9
Merge pull request #1755 from KobbyKnight/master
Issue 1643 fix
2019-11-13 16:09:01 +05:30
jitendra 2446f56413 Issue #1746, #1271, #1735 fixed 2019-11-12 13:52:38 +05:30
KobbyKnight e91049ebf3 Issue 1643 fix 2019-11-11 16:28:47 +00:00
jitendra 08e87ccf8d Issue #1559 fixed 2019-11-05 16:23:43 +05:30
Jitendra Singh 6537f66441
Merge pull request #1739 from jitendra-webkul/jitendra
Issue #1732 fixed
2019-11-05 13:12:33 +05:30
jitendra 803957c894 Issue #1732 fixed 2019-11-05 13:11:11 +05:30