Commit Graph

3496 Commits

Author SHA1 Message Date
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
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
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
Jitendra Singh 8ef4c64d01
Merge pull request #1920 from shubhwebkul/master
Throw exception when user is not is session
2019-12-19 16:05:46 +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
Jitendra Singh 61ab18dd32
Merge pull request #1914 from Haendlerbund/two-more-events
add two events to profile index blade view
2019-12-19 10:29:24 +05:30
David Große d667263313 add two events to profile index blade view 2019-12-18 16:26:38 +01:00
Jitendra Singh 3e3cab6bf2
Merge pull request #1909 from KevinLaveto/patch-2
Multiple type file error
2019-12-18 15:59:36 +05:30
KevinLaveto 02d42d6186
Multiple type file error 2019-12-18 11:18:57 +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
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
Jitendra Singh 56a486d281
Merge pull request #1899 from rahulshukla-webkul/development
Development
2019-12-18 11:46:56 +05:30
rahul shukla b033901678 Issue #1897, added configuartion for live account in paypal 2019-12-18 11:42:07 +05:30
Hans Schouten 67ef3b0c7a
Allow datagrid action to have target="_blank" 2019-12-17 08:28:58 +01:00
MonaHartdegen 5d9923bf30 improved usage of var/let/const; fixed error on removing row 2019-12-16 15:42:32 +01:00
rahul shukla b6493a590b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-16 18:56:37 +05:30