Commit Graph

3534 Commits

Author SHA1 Message Date
David Große 11081654bb prepare functional test integration 2020-01-10 11:23:31 +01:00
David Große 3ca5c99f27 introduce company_name column to customer_addresses 2020-01-10 11:05:09 +01:00
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
Jitendra Singh 88445a7ad5
Merge pull request #2020 from jgannondo/master
README.md: Updates to improve readability
2020-01-10 13:23:07 +05:30
Jitendra Singh da829718a5
Merge pull request #1989 from Haendlerbund/bugfix-types-having-variants-pr-1798
Bugfix: Exception while applying catalog rule
2020-01-10 13:20:59 +05:30
John Gannon 57c23ef2bc README.md: Updates to improve readability 2020-01-09 15:37:13 -05:00
Jitendra Singh 6ed1410821
Merge pull request #2019 from jitendra-webkul/1.0
Issue #1979 fixed
2020-01-09 17:14:16 +05:30
Jitendra Singh 14869df230 Issue #1979 fixexd 2020-01-09 17:03:58 +05:30
Jitendra Singh e3d6592257
Merge pull request #2018 from rahulshukla-webkul/development
Issue #1983
2020-01-09 13:50:15 +05:30
rahul shukla 0f0cc82058 Issue #1983 2020-01-09 13:39:13 +05:30
Jitendra Singh 8b82e42f74
Merge pull request #2017 from rahulshukla-webkul/development
Development
2020-01-09 13:34:29 +05:30
rahul shukla 6413cdae71 added star in state view in datagrid 2020-01-09 13:07:43 +05:30
rahul shukla 830367ef93 loop issue in tax calculate, #1994 2020-01-09 12:48:59 +05:30
Jitendra Singh b83992a6be
Merge pull request #2016 from rahulshukla-webkul/development
Issue 2012
2020-01-09 12:00:14 +05:30
rahul shukla b5b00bb4f8 Issue 2012 2020-01-09 11:33:54 +05:30
Jitendra Singh a66f556aca
Merge pull request #2014 from jitendra-webkul/1.0
Transation models added for country and state
2020-01-08 19:00:34 +05:30
Jitendra Singh c7449aed48 Transation models added for country and state 2020-01-08 18:59:36 +05:30
Jitendra Singh 55df0ad02f
Merge pull request #2013 from jitendra-webkul/1.0
Issues #1997, #1994 fixed
2020-01-08 17:02:39 +05:30
Jitendra Singh ca0f8bca49 Issues #1997, #1994 fixed 2020-01-08 17:01:50 +05:30
Jitendra Singh a0c02e6c4a
Merge pull request #2011 from jitendra-webkul/1.0
Tax rates for all states
2020-01-07 19:37:42 +05:30
jitendra fbfd710f1c Tax rates for all states 2020-01-07 17:48:43 +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
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
jitendra fafa0df14a Catalog rule and cart rule applied on all product types 2020-01-06 17:47:43 +05:30
jitendra 77563c57f1 Catalog rules working for all product types 2020-01-06 13:00:01 +05:30
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
Jitendra Singh 94e6b844af
Merge pull request #2000 from rahulshukla-webkul/development
Development
2020-01-03 18:06:57 +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 25dff89054 translation added for locales 2020-01-03 16:12:23 +05:30
rahul shukla 9b120a978d foter text change 2020-01-03 15:57:43 +05:30
rahul shukla a283ebdb44 link in installer 2020-01-03 15:42:18 +05:30
rahul shukla 297165859f foter text change 2020-01-03 15:35:56 +05:30
Jitendra Singh 5c050822c1
Merge pull request #1995 from Haendlerbund/fix-product-links-in-views
Fixed product links in two views (replaced hard coded link with route)
2020-01-03 14:44:17 +05:30
MonaHartdegen dc89cd6511 fixed product links in two views (replaced hard coded link with route) 2020-01-02 13:14:53 +01:00
Annika Wolff 74348ac5be resolve warning exception occurring on apply of catalog rule 2019-12-30 11:03:50 +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
rabol 0abc5ec43e Make it possible to specify currency in .env 2019-12-28 11:22:41 +01:00
rabol a63c2f9fd8 Make it possible to specify timezone in .env 2019-12-28 10:38:54 +01:00
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +05:30
Jitendra Singh a22b98129e
Merge pull request #1901 from HansSchouten/patch-1
Allow datagrid action to have target="_blank"
2019-12-24 13:13:16 +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
Jitendra Singh 02b2d171b7
Merge pull request #1937 from Haendlerbund/minor-code-style-improvements
Minor code style improvement in ProductRepository
2019-12-24 13:12:12 +05:30