Commit Graph

3521 Commits

Author SHA1 Message Date
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
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
peternuernberger af28c35bf7 Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets 2019-12-30 09:32:49 +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
Jitendra Singh f77e1be2bf
Merge pull request #1961 from yegobox/master
fix: broken url sometimes when finishing installation,go to wrong address
2019-12-24 13:12:03 +05:30
Richard Mura bef5be71af fix: broken url sometimes when finishing installation,go to wrong application url 2019-12-21 21:49:14 +02: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
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 bad6665fb7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-20 19:35:15 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
MonaHartdegen 6f58fc041f increase maintainability by replacing hard coded class names by <Classname>::class in ProductRepository 2019-12-20 09:56:47 +01:00
Jitendra Singh 619b922ba4
Merge pull request #1922 from rahulshukla-webkul/development
Issue 1802.
2019-12-20 12:38:53 +05:30
rahul shukla 642d99a63c Issue #1792 2019-12-19 17:42:12 +05:30
rahul shukla 370480572f Issue 1802. 2019-12-19 17:21:40 +05:30
Jitendra Singh 3c0de30400
Merge pull request #1921 from rahulshukla-webkul/development
Development
2019-12-19 16:49:47 +05:30