Commit Graph

181 Commits

Author SHA1 Message Date
Pranshu Tomar eb109b2aee Issue #3048 fixed 2020-05-13 17:21:44 +05:30
Florian Bosdorff 33ddae27ae fix namespace issues 2020-05-09 12:38:20 +02:00
Jitendra Singh fa8120b1bf
Merge pull request #2692 from Haendlerbund/improve-have-product-faker
refactor haveProduct() method to allow custom attribute handling
2020-04-10 11:43:34 +05:30
rahulshukla-home 172310bfd1 Issue #2847 2020-04-09 14:43:32 +05:30
Herbert Maschke b8e4692114 refactor haveProduct() method to allow custom attribute handling 2020-03-18 14:59:10 +01:00
Herbert Maschke 985d5bfb2e Unfortunately it does _not_ yet fix the bug. Release the lock of
codeception later when fixed...

This reverts commit 4f375648cc.
2020-03-18 08:09:05 +01:00
Herbert Maschke 4f375648cc remove lock of codeception to 4.1.1 (4.1.3 has been released yesterday which fixes the bug) 2020-03-18 08:05:19 +01:00
Herbert Maschke e6c3fb050c lock codeception to 4.1.1 2020-03-17 14:33:48 +01:00
Herbert Maschke fd096e7248 stay on phpunit 7.x for a while... 2020-03-17 14:24:36 +01:00
Herbert Maschke 7a3a1726bc Merge branch 'bagisto/master' into order-workflow-improvements 2020-03-06 15:50:26 +01:00
Herbert Maschke 3e9c68f01d introduce prepareCart() to be able to do checkout tests [wip] [ci-skip] 2020-02-28 11:41:48 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
rahul shukla 663e21a771 Issue #2435 and change log updated 2020-02-20 12:17:40 +05:30
Jitendra Singh fa53b72058 Booking product type added 2020-02-14 11:40:12 +05:30
shubhammehrotra.symfony@webkul.com 1b368789e5 bagisto velocity theme updates 2020-01-26 14:17:05 +05:30
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30
shubhammehrotra.symfony@webkul.com 3f377c929e Merge branch 'master' of https://github.com/bagisto/bagisto into velocity 2020-01-24 18:52:45 +05:30
rahul shukla 15aca03e54 codeception/module-laravel5 2020-01-22 19:16:47 +05:30
rahul shukla 0a0a86bf46 codeception/module-filesystem 2020-01-22 19:12:46 +05:30
rahul shukla 4e03cd81d3 codeception/module-asserts 2020-01-22 18:59:39 +05:30
rahul shukla 01f0fc9a57 2089 and updated codeception dependencies 2020-01-22 18:44:53 +05:30
Jitendra Singh 3046aa617b PHP version updated in composer.json 2020-01-21 17:02:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
shubhammehrotra.symfony@webkul.com 81d9d34acc velocity-configuration-added 2020-01-16 13:22:18 +05:30
shubhammehrotra.symfony@webkul.com 7c1bd634f2 remove velocity 2020-01-16 13:09:33 +05:30
shubhammehrotra.symfony@webkul.com 485fbcb1c5 Merge branch 'velocity' of github.com:shubhwebkul/bagisto into velocity 2020-01-16 13:05:55 +05:30
Jitendra Singh 0f52762c3c Issue #1820 fixed 2020-01-10 15:50:39 +05:30
shubhammehrotra.symfony@webkul.com eb880441f6 resolved conflits 2020-01-07 13:10:48 +05:30
shubhammehrotra.symfony@webkul.com 242446627b merged with original 2020-01-07 13:10:34 +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
MonaHartdegen d52ef533c7 replace wildcard route for products and categories with fallback route 2020-01-03 13:09:06 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
shubhammehrotra.symfony@webkul.com 113c5753d7 velocity initial 2019-12-26 18:05:21 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +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
Jitendra Singh 9486f00987
Merge pull request #1789 from bosix/1754-add-codeception
#1745 - add codeception and example tests
2019-12-13 15:30:51 +05:30
Florian Bosdorff 745153a8cb add migrate:fresh before running tests 2019-12-10 07:22:05 +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
Florian Bosdorff 945bbd71cc
Merge branch 'master' into 1754-add-codeception 2019-11-25 16:34:30 +01:00
shubhammehrotra.symfony@webkul.com c22e8f7c9c Bagisto content added using post create-project event 2019-11-25 14:59:51 +05:30
Herbert Maschke ebcc66ab59 remove alkhachatryan/laravel-web-console 2019-11-25 08:02:55 +01:00
Florian Bosdorff e416aef618 add codeception and example tests 2019-11-23 23:05:38 +01:00
Alexey 988e21bfa7 Changed back the package name in the compsoer 2019-11-13 01:31:31 +04:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
Prashant Singh a9bb0ca129 merge sync 2019-09-24 11:59:02 +05:30
rahul shukla 58331043e9 translatable package update 2019-09-20 14:49:53 +05:30
Prashant Singh 32b05c924d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 16:29:43 +05:30
Prashant Singh ec6dd75dfe JWTAuth package's dependency is now version restricted 2019-09-05 16:28:36 +05:30
Jitendra Singh c4de6548dd
Merge pull request #1396 from ghermans/dusk
fixed #1367
2019-09-05 16:25:56 +05:30
Glenn Hermans b3eb0b3f88
fixed #1367 2019-09-05 12:12:45 +02:00
Prashant Singh 70f3cf6219 Development branches removed from composer dependencies 2019-09-05 13:23:33 +05:30
Prashant Singh 6693a443d3 Removed latest flag check from prettus l5 repository 2019-09-04 14:00:45 +05:30
Prashant Singh 0468a1fdd6 Changes in core repository made 2019-09-04 13:36:34 +05:30
Prashant Singh 0e51a9eab2 Changed minimum php version to 7.2 2019-09-04 11:39:20 +05:30
Prashant Singh f1f0bcac8c Dead mods removed 2019-09-03 12:24:20 +05:30
Prashant Singh 108795778b Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-02 19:53:25 +05:30
Glenn Hermans 2619623a24
Possible fix for #1367 2019-08-30 10:39:55 +02:00
Prashant Singh 0c79d87503 Removed stripe fees visibility from every where 2019-08-23 13:15:10 +05:30
Prashant Singh b62b277cac Integrated GTM 2019-08-23 08:56:25 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Prashant Singh 9b0c3456e5 Modules preorder, customer document and group catalog updated 2019-07-30 16:22:27 +05:30
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
Prashant Singh f8c774b3a5 Started with convert x to product id for cart rules 2019-07-13 15:23:27 +05:30
Prashant Singh 093a485470 Opted out Dusk & Debugbar packages out of auto discovery 2019-07-10 13:59:33 +05:30
Prashant Singh 68bba4d7e2 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-09 12:54:42 +05:30
Amir Shahbandegan ec40ccb41b
Added intl extension to composer.json 2019-07-06 12:01:26 +04:30
Prashant Singh bebf5e105b Base sync with github master 2019-06-27 13:11:48 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Prashant Singh 6fd67e56d7 New repo with base sync 2019-06-22 01:02:33 +05:30
Prashant Singh 3b0ef1bade Removed php loc from require dev of composer.json 2019-06-10 13:57:09 +05:30
Prashant Singh 6da603530e
Cart rule inside promotions, various improvements and fixes. (#964)
* Some syntax issue fixes

* Adding discount things inside promotions in admin

* routes updated for creating discount rules

* fixed customer profile redirect parameter issue

* added cart and catalog rule routes to admin section

* migrations for discount almost to be finished, final revision left

* migrations for discounts complete

* catalog rule form underway

* catalog rule

* Made some dynamic form fields in catalog rule create form

* made some changes for custom validations used in ProductForm request class

* working on prepopulating the values fields in conditions

* need another revisit on discount rules tables and then prepare for actions

* removed discounts table

* catalog rule form changed to muliti attribute set for single condition

* new icons added for promotion and customer note. new action for customer added to take notes on the customers

* catalog and cart rule designs stable, now moving towards validations on client side and backend

* catalog rules migrations added

* catalog rule models added with contracts and proxies

* fixed customer group bug in customer registration controller

* fixed customer registration bug due to last fix

* fixed product card image not found issue

* catalog rule translations added

* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.

* making cart attributes for cart rules

* Added more fields for cart rules

* working on conditions for cart rule form

* minor changes in migrations related to price rules

* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel

* part of conditions on the cart rule form added

* daily sync

* cart rate migrations updated

* Added select and multi select attributes options fetching with ajax on catalog rule form

* changed some migrations and data being populated at runtime inside catalog rule form

* catalog rule create complete, migrations changes, translations added

* catalog rule edit form complete

* catalog rule form complete, now moving towards catalog rule products

* added delete functionality for catalog rules

* added cart rule preferences for coupon codes

* cart rule submission problem due to repository issue

* Cart rule form and migrations complete

* Models and Repositories updated for cart rule usage

* base sync with master

* designing process to get suitable discount rules

* cart rule form completed

* added helpers in cart and discount to apply rules on cart at checkout or not

* cart rule coupon implementation in progress for discount coupon in shop checkout pages

* cart rules working

* added coupon box on checkout screen

* removed the conditions empty bug

* Nearing to completion of coupon based rules

* made some changes in cart rule coupon application on checkout related to new designs

* some bug fixes

* calculation for automatic cart rules complete

* non couponable cart rules implemented, now moving on to binding them on frontend

* some conditions improvements in couponable cart rules

* some bug fixes

* removed some bugs from summary blade for cart rule

* added the table for cart rule cart for managing rules with cart and removed various bug fixes

* some bug fixes

* Removed bugs and added coupon based cart rule removal functionality

* some bug fixes

* cart rule labels refactoring in midway

* Cart rule labels bug fixed

* removed margin classes from shop to UI

* Refactoring cart rule on front end

* added checks

* Discount rule implemented.

* cart rule bug fixes

* provision to remove the couponable and non couponable rule had been added

* Cart rule frontend work done

* altered some frontend variables on onepage checkout

* Altered cart rules to some extent
2019-06-10 13:19:05 +05:30
Prashant Singh 520c21a4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-13 10:32:42 +05:30
Prashant Singh 3fe8152758 added php tooltip.js dependency and laravel dusk for browser tests profiling 2019-04-12 18:20:33 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
jitendra fb6ffaa9d9 JWT implemented for customer api authorization 2019-04-09 16:27:33 +05:30
Prashant Singh 54d2a000c8 Fixing some issues and probably solving later 2019-03-25 15:59:37 +05:30
Prashant Singh 718a5eaa20 Resolved the issue #517 and removed the intented url from admin as admin don't require 2019-02-14 17:54:46 +05:30
Prashant Singh 616d1bf160 merged with master 2019-02-13 11:40:56 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
jitendra fec802b4af Changed registration page input tag to button 2018-12-27 13:03:54 +05:30
rahul shukla e1b2d1eb01 export for customer 2018-11-29 17:39:39 +05:30
prashant-webkul 8b0c51c519 Validation messages fixes for client, product grid fixes, customer email verification fixes and changes, migration changes for customer gender columns and other isssues and bug fixes 2018-11-27 16:25:23 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +05:30
prashant-webkul 662ff09a24 Bug Fixes 2018-11-21 11:59:18 +05:30
prashant-webkul ab9328d755 Auth API implemented using JWT tokens, removed laravel passport 2018-11-19 17:04:13 +05:30
prashant-webkul 14997d6e97 OAuth Using Laravel Passport 2018-11-17 19:26:48 +05:30
jitendra f0ef4f910a Paypal Integration added 2018-11-16 15:41:08 +05:30
jitendra c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
jitendra b182325772 Customer address form issues fixed, invoice print feature addred 2018-11-01 19:18:59 +05:30
jitendra a85f6bb9b9 update fork 2018-10-30 20:03:03 +05:30
jitendra d79bad5ced composer.json updated 2018-10-30 18:49:36 +05:30
jitendra b4e79a87ca Editor added to the product edit page, slider form page and channel create and edit form 2018-10-30 16:54:24 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
jitendra 1e16931ba3 Countries and States models added 2018-10-12 18:24:10 +05:30
prashant-webkul 7319a8c40a Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 13:53:22 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
prashant-webkul f28f716d9f Bug fixes across the system 2018-10-11 19:55:59 +05:30