Commit Graph

4751 Commits

Author SHA1 Message Date
Shubham Mehrotra c51cb168e8 new and featured products from ajax 2020-02-02 19:55:03 +05:30
Shubham Mehrotra fd4657f991 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-01 13:50:10 +05:30
Shubham Mehrotra 1f6ce71303 resolved issues 2020-02-01 13:42:53 +05:30
Steffen Mahler 8abce3302a tax helper introduced, views changed to display multiple tax rates 2020-01-31 16:08:01 +01:00
shubhammehrotra.symfony@webkul.com be3b8e34a7 category and category products through ajax 2020-01-31 20:01:36 +05:30
Jitendra Singh 09a7cc949a
Merge pull request #2222 from jitendra-webkul/1.0
Issue #2202 fixed
2020-01-31 19:17:19 +05:30
Jitendra Singh 677cd7e542 Issue #2202 fixed 2020-01-31 19:16:45 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Annika Wolff ab9300bbef merged conflicting factory manually 2020-01-31 09:40:12 +01:00
Jitendra Singh 09fe8cea1c
Merge pull request #2220 from rahulshukla-webkul/development
Development
2020-01-31 13:58:47 +05:30
Jitendra Singh a378c09f23
Merge pull request #2208 from vivek-webkul/patch-2
[Fixed: changed customer group code for newly created customer.]
2020-01-31 13:58:26 +05:30
rahul shukla 7fdf5b66ab Issue #2173 2020-01-31 13:31:38 +05:30
rahul shukla c64bb4f85b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-31 13:19:00 +05:30
rahul shukla 6565f25153 Issue #2182 2020-01-31 13:18:40 +05:30
Jitendra Singh 37dba8eabf
Merge pull request #2218 from jitendra-webkul/1.0
Issue #2203 fixed
2020-01-31 12:53:17 +05:30
Jitendra Singh 48398597bf Issue #2203 fixed 2020-01-31 12:48:35 +05:30
Jitendra Singh d9d7c2bc40
Merge pull request #2215 from Haendlerbund/introduce-some-cart-factories
add some factories
2020-01-31 12:35:25 +05:30
Jitendra Singh 4ebc76cc64
Merge pull request #2217 from jitendra-webkul/1.0
Issue #2207 fixed
2020-01-31 12:28:22 +05:30
Jitendra Singh dd634691fe Issue #2207 fixed 2020-01-31 12:23:52 +05:30
Jitendra Singh f3a34d5da9
Merge pull request #2212 from Haendlerbund/refactor-functional-attribute-test
refactor functional AttributeCest, that was flickering sometimes
2020-01-31 12:07:26 +05:30
Jitendra Singh 3c16599ddb
Merge pull request #2211 from Haendlerbund/add-channel-and-locale-filter-to-product-grid
Add channel and locale filter to product grid
2020-01-31 12:03:59 +05:30
shubhammehrotra.symfony@webkul.com e578d7d1db route issue resolved 2020-01-31 11:53:31 +05:30
Jitendra Singh e629a560d7
Merge pull request #2205 from rahulshukla-webkul/development
Issue #2192
2020-01-31 11:27:14 +05:30
Herbert Maschke 178f89165e add required validations 2020-01-31 06:06:13 +01:00
Herbert Maschke 76b58e9bd8 some first_name and last_name input fields 2020-01-31 05:59:12 +01:00
Herbert Maschke 4d28188efb move factories into appropriate packages and remove redundant ones 2020-01-31 05:42:13 +01:00
Herbert Maschke e76c1794b9 add some factories into webkul core package to enhance testing potential 2020-01-30 21:01:45 +01:00
Herbert Maschke 6be3d086f8 add ability to provide company_name in address during checkout (optional) 2020-01-30 20:56:01 +01:00
Annika Wolff 1c1de92ca9 undo database renaming 2020-01-30 16:54:47 +01:00
Florian Bosdorff 389b40fdce Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid 2020-01-30 16:04:57 +01:00
Annika Wolff ee1f9bb57c refactor functional AttributeCest, that was flickering sometimes 2020-01-30 15:47:22 +01:00
shubhammehrotra.symfony@webkul.com 7e2abffede rtl initial 2020-01-30 18:21:04 +05:30
rahul shukla ebab486fc1 merge with master 2020-01-30 16:21:00 +05:30
rahul shukla ae0e7d2c05 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-30 16:20:41 +05:30
Vivek Sharma 2ff9ebfa17 [Fixed: changed customer group code for newly created customer.] 2020-01-30 15:57:56 +05:30
rahul shukla b40c2173a8 Issue #2204 2020-01-30 15:22:39 +05:30
Steffen Mahler 8b196c9c9c merge remote-tracking branch 'bagisto/master' into fix-tax-handling 2020-01-29 14:12:43 +01:00
rahul shukla 3ac48ee883 Issue #2192 2020-01-29 18:27:47 +05:30
shubhammehrotra.symfony@webkul.com 6923e43c1e Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-01-29 17:51:38 +05:30
shubhammehrotra.symfony@webkul.com b76bed2a89 minor bug fixes 2020-01-29 17:41:42 +05:30
shubhammehrotra.symfony@webkul.com d23d3b4f8c search in particular category 2020-01-29 17:33:28 +05:30
Jitendra Singh 217412a563
Merge pull request #2201 from rahulshukla-webkul/development
Development
2020-01-29 17:08:53 +05:30
rahul shukla 7c3c63e445 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-29 16:46:23 +05:30
rahul shukla 40e85523a1 Issue #2185 2020-01-29 16:46:10 +05:30
Jitendra Singh 25d99cc10a
Merge pull request #2200 from jitendra-webkul/1.0
Issue #2176, #2196 fixed
2020-01-29 16:40:54 +05:30
Jitendra Singh 813f61eeaa Issue #2176, #2196 fixed 2020-01-29 16:37:20 +05:30
Jitendra Singh c197bf2508
Merge pull request #2199 from rahulshukla-webkul/development
Development
2020-01-29 16:14:58 +05:30
Steffen Mahler d722ba8665 change annotation comment 2020-01-29 11:43:19 +01:00
rahul shukla a5853bb030 Issue #2198 2020-01-29 16:09:49 +05:30
rahul shukla 97332a1fc3 Issue #2192 2020-01-29 16:06:56 +05:30