Commit Graph

1114 Commits

Author SHA1 Message Date
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
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
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
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
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
Herbert c9f97df44c also pass $product into view_render_event() 2019-11-15 11:53:38 +01:00
Herbert 2a49c926d9 introduce two view_render_event hooks in product edit form 2019-11-15 10:01:26 +01:00
Alexey 81608be9fa Removed useless classes usages 2019-11-13 01:35:23 +04:00
Alexey 072eddb397 Updated multilang 2019-11-13 01:30:09 +04:00
Alexey 8cdc984565 Minified back the admin UI.CSS file 2019-11-13 01:23:50 +04:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
jitendra 257392cd2a Issue #1118 fixed 2019-11-07 17:39:59 +05:30
jitendra 65d4e8698a Issue #924 fixed 2019-11-07 15:42:34 +05:30
jitendra faef8adcdb Issue #1745 fixed' 2019-11-07 12:50:40 +05:30
jitendra 19b8de0ffb Issue #1167 fixed 2019-11-06 13:54:57 +05:30
jitendra 30e2a743e8 Issue #1303 fixed 2019-11-05 19:02:07 +05:30
jitendra 62d5fb1c15 Issue #1704 fixed (Update channel 'Base Curreny' label to 'Default Currency') 2019-11-05 16:53:46 +05:30
jitendra 08e87ccf8d Issue #1559 fixed 2019-11-05 16:23:43 +05:30
Jitendra Singh 65a7008452
Merge pull request #1734 from rahulshukla-webkul/development
Issue #1733
2019-11-05 12:02:19 +05:30
rahul shukla 2f82ba1f95 Issue #1733 2019-11-05 11:20:28 +05:30
jitendra c0a4e2fe26 Issue #1721 fixed 2019-10-31 19:06:52 +05:30
Jitendra Singh 9baf4cac3a
Merge pull request #1709 from prashant-webkul/bugs_patch_1
Added logo, favicon in fillable of channel model
2019-10-31 12:21:03 +05:30
Prashant Singh e5082cca3b Added logo, favicon in fillable of channel model 2019-10-30 10:40:12 +05:30
Matt April 3ebdde7681 Replaced direct env references of MAIL_SHOP_FROM with config file references. Also enabled optional usage of MAIL_FROM_NAME. 2019-10-26 11:09:46 -04:00
Matt April 54babf9079 Moved ADMIN_MAIL_TO into mail config 2019-10-26 11:07:41 -04:00
Jitendra Singh 3cbbbbe340
Merge pull request #1481 from codeinnovers/master
fix of issue #1480
2019-10-24 18:51:40 +05:30
Jitendra Singh 4fcff1e111
Merge pull request #1650 from shivam-webkul/shivam
[Bug Fixed #1219 ] & [Enhancement #1182]  Fixed
2019-10-24 10:36:53 +05:30
Jitendra Singh 70b7a712c7
Merge pull request #1691 from prashant-webkul/bugs_patch_1
Fixed issues related to Promotions: Cart Rule
2019-10-24 10:29:39 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
Jitendra Singh c0162e6491
Merge pull request #1689 from jitendra-webkul/jitendra
Issue #1686 fixed
2019-10-23 13:50:51 +05:30