Commit Graph

1139 Commits

Author SHA1 Message Date
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
rahul shukla 0f0cc82058 Issue #1983 2020-01-09 13:39:13 +05:30
rahul shukla 6413cdae71 added star in state view in datagrid 2020-01-09 13:07:43 +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
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
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 297165859f foter text change 2020-01-03 15:35:56 +05:30
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 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 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 642d99a63c Issue #1792 2019-12-19 17:42:12 +05:30
rahul shukla 2f0338bda3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-19 16:47:20 +05:30
rahul shukla 10d4613446 Issue #1879 and #1880 2019-12-19 16:47:00 +05:30
KevinLaveto 02d42d6186
Multiple type file error 2019-12-18 11:18:57 +01:00
peternuernberger d92bb0ea72 Merge branch 'bagisto/master' into feature/update-npm-assets 2019-12-18 09:41:40 +01:00
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 b033901678 Issue #1897, added configuartion for live account in paypal 2019-12-18 11:42:07 +05:30
MonaHartdegen 5d9923bf30 improved usage of var/let/const; fixed error on removing row 2019-12-16 15:42:32 +01:00
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
rahul shukla 6af302fa95 Issue #1848 2019-12-13 17:06:32 +05:30
Jitendra Singh 9f5c82068e
Merge pull request #1889 from rahulshukla-webkul/development
Issue #1808
2019-12-13 14:39:54 +05:30
rahul shukla dade205e81 Issue #1808 2019-12-12 20:10:12 +05:30
MonaHartdegen 2feb9114bd removed remnants of laravel-web-console from development view and language files 2019-12-12 13:23:52 +01:00
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
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
Jitendra Singh 3eb7d862b1
Merge pull request #1798 from Haendlerbund/configurables-with-varying-variant-types-PR-1782
Configurables with varying variant types - Enhancement
2019-12-04 18:58:59 +05:30
peternuernberger b066833068 Merge remote-tracking branch 'bagisto-hb/master' into feature/update-npm-assets 2019-12-04 11:41:17 +01:00
Jitendra Singh 1048cbc5c9
Merge pull request #1791 from thyseus/remove-alkhachatryan/laravel-web-console
remove alkhachatryan/laravel-web-console
2019-12-03 14:43:19 +05:30
Jitendra Singh b7b3441607
Merge pull request #1775 from thyseus/introduce-order-item-events
introduce 'checkout.order.orderitem.save.[before/after]' events
2019-12-03 14:39:11 +05:30
peternuernberger 8cb3c5895a updated publishable folders 2019-12-02 12:26:55 +01:00
peternuernberger c1f648a17f excluded import statements 2019-12-02 11:41:02 +01:00
peternuernberger 6c398f45bd updated some dependencies 2019-11-29 16:46:35 +01:00
Annika Wolff 71e8e687c2 PR 1782 Enhancement: Let variants be of other types than simple 2019-11-26 13:32:42 +01:00
Herbert Maschke ebcc66ab59 remove alkhachatryan/laravel-web-console 2019-11-25 08:02:55 +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
Herbert 59d2a77d7d two more view_render_events in sales order tabs 2019-11-22 09:46:38 +01:00
Annika Wolff 9a43776cc0 introduce ProductType Helper 2019-11-21 16:56:21 +01:00
Jitendra Singh e3d9377dc4
Merge pull request #1770 from thyseus/introduce-two-render-events
introduce two view_render_event hooks in product edit form
2019-11-20 13:52:25 +05:30