Commit Graph

298 Commits

Author SHA1 Message Date
Herbert Maschke df9fce8930 typo fix, minor refactoring 2020-01-14 14:02:32 +01:00
Herbert Maschke 298a3a68ab use faker->vat in factory 2020-01-14 13:43:06 +01:00
David Große 9524c78ad5 various code style improvements 2020-01-14 10:49:22 +01:00
David Große d42236974d removed redundant migration 2020-01-14 10:27:39 +01:00
David Große 72c3e289c7 remove the splitting into first_name and last_name again - it can be desastrous to drop a column in a productive environment 2020-01-14 10:25:26 +01:00
David Große 70d424527e adjust factory 2020-01-13 11:44:36 +01:00
David Große da7db34fe9 add customer_vat_id column to order table 2020-01-13 11:43:28 +01:00
David Große 7eee7e3134 split the 'name' column in the customer addresses into 'first_name' and 'last_name' - it is more common to save the data in this structure 2020-01-13 11:20:04 +01:00
David Große 81c928025b remove address3 from customer_addresses fillable 2020-01-13 09:38:48 +01:00
Jitendra Singh cf36d252a0 Issue #1764 fixed 2020-01-13 12:44:36 +05:30
Jitendra Singh 0b71abedbf Issue #1764 fixexcd 2020-01-13 12:26:53 +05:30
David Große 109b503609 display vat_id and company_name in edit.blade.php 2020-01-10 14:16:34 +01:00
David Große 7429d32072 introduce VatValidator.php 2020-01-10 14:07:58 +01:00
David Große 3af9a825c9 add optional vat_id to customer addresses 2020-01-10 11:59:53 +01:00
David Große f1090efa73 add factories necessary for testing customer and customer addresses 2020-01-10 11:51:03 +01:00
David Große 3ca5c99f27 introduce company_name column to customer_addresses 2020-01-10 11:05:09 +01:00
David Große e962dbc988 allow defaultCountry also in edit.blade 2020-01-08 14:56:22 +01:00
David Große 37a4f6adb6 ensure the api_token is being generated on customer/admin creation 2020-01-03 09:14:12 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
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 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
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
Mona Hartdegen 25c2a15b65 introduced url structure for categories and products (SEO improvements) 2019-11-21 17:14:53 +01:00
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
Jitendra Singh a9ce5bea76
Merge pull request #1726 from prashant-webkul/bugs_patch_1
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:42:55 +05:30
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
jitendra ab2d069ec7 Issue #1519 fixed 2019-10-31 17:07:49 +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
jitendra 62533d9df8 postcode column changed to varchar from int 2019-10-24 17:38:08 +05:30
jitendra 1050f4a82c Removed comment from WishlistController 2019-10-24 17:11:33 +05:30
jitendra dfb9c75e77 Move wishlist to cart issue fixed 2019-10-24 17:08:41 +05:30
naresh verma 2d2302c398 resolve conflicts 2019-10-21 13:38:29 +05:30
naresh verma bfddda8ce2 resolved conflicts [issue #1645] 2019-10-18 19:43:03 +05:30
Jitendra Singh 65d9c0b283
Merge pull request #1652 from vivek-webkul/patch-5
[Enhancement #737: Fields added to the customer DataGrid and customer…
2019-10-18 17:42:07 +05:30
Vivek f8767adc0d [Enhancement #737: Fields added to the customer DataGrid and customer addresses section added at admin end.] 2019-10-17 18:12:51 +05:30
naresh verma 205cb21aa8 added success notification after customer delete. 2019-10-17 17:56:24 +05:30
naresh verma 0b54a5edbc issue #1645 code refector 2019-10-17 17:40:33 +05:30
naresh verma 28ed55d711 Bug Fixed #1645: No confirm password action when customer is deleting his profile 2019-10-17 17:24:01 +05:30
Vivek ee5a63c4e4 [Bug Fixed #1640 and #1642: Customer delete issue resolved if any invoice is in pending.] 2019-10-17 15:17:02 +05:30
rahul shukla bcd656e364 Issue #1563 2019-10-09 18:30:18 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla 878c0eb8e5 Issue #1463 2019-10-07 16:36:16 +05:30
Prashant Singh ba4dc11687 Fixed issue #1532 2019-09-30 10:56:38 +05:30
Prashant Singh 2ffe9a5c12 customer channel checks removed, statuatory migration warning for those using channels specifically for customers. 2019-09-26 17:00:28 +05:30
Prashant Singh f6ce3643c0 Fixed issue #1524 2019-09-26 16:45:44 +05:30
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
prateek srivastava 98792912d8 translation added 2019-09-13 12:50:06 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
rahul shukla 403a9dda4c wishlist icon is active when item is already in wishlist 2019-09-10 13:10:58 +05:30
rahul shukla 599bffdce7 wishlist icon is active when item is already in wiahlist 2019-09-10 12:35:52 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Prashant Singh 1e0da3c42a Fixed issue #778 2019-08-29 16:11:12 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Prashant Singh 2a36c6bd0e Catalog rule implementation in progress 2019-08-12 19:23:33 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Prashant Singh 352479912a Added unique constraint in customer group code column 2019-08-09 14:24:11 +05:30
Prashant Singh fbedc8a161 Added env's shop_mail_from param param in all mails related to customers and shop 2019-08-06 20:00:28 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
rahul shukla 39139f26ca Issues #1228 and #1229 2019-07-30 13:45:13 +05:30
rahul shukla c73e12a052 try, catch for password reset. issue #1177 2019-07-30 10:50:05 +05:30
rahul shukla bcd84d9e7f corrction in route 2019-07-23 12:04:09 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
rahul shukla ef5eb1356c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-19 16:30:28 +05:30
rahul shukla 383e782d3c route correction for customer after login 2019-07-18 13:10:10 +05:30
Arpad 4a941e461c Forget password notification Subject translation 2019-07-17 14:36:00 +02:00
Prashant Singh 0b29f29022 Added property in customers model to check if the email exists or not 2019-07-15 12:46:33 +05:30
jitendra a514ad5c02 Added jwt service provider to app.php 2019-07-03 15:16:06 +05:30
jitendra b7d346260a Resolve conflicts 2019-07-01 17:12:44 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +05:30
Jitendra Singh e9608d87ef
Merge pull request #1143 from prashant-webkul/development
Development
2019-06-29 18:49:00 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +05:30
jitendra ad6e422fdb Added downloadable and virtual products 2019-06-29 15:23:34 +05:30
jitendra 55b71e1e66 updated 2019-06-28 19:48:52 +05:30
rahul shukla 0088bf7709 check in phone column unique removal 2019-06-28 15:44:17 +05:30
rahul shukla 7c8dc15c58 check in phone column unique removal 2019-06-28 15:43:53 +05:30
rahul shukla fdb9252b2a check for phone column & verrion last digit check in installer 2019-06-28 15:18:48 +05:30
Prashant Singh 9b83fb8025 Fixed issue #1080 2019-06-27 16:14:24 +05:30
rahul shukla be8c11aa98 issue #1069 2019-06-19 16:32:38 +05:30
jitendra a2d1e1aa85 Column 'code' added in customer_groups table 2019-06-15 18:50:38 +05:30
Jitendra Singh d4d9c3e5ee
Revert "Revert "Added Guest default customer group with id 0"" 2019-06-15 16:48:29 +05:30
Jitendra Singh 1a15791f9d
Merge pull request #1039 from jitendra-webkul/jitendra
Reset changes
2019-06-15 16:47:36 +05:30
jitendra e3946a79dd Reset changes 2019-06-15 16:46:55 +05:30
Jitendra Singh 426cbe0ae5
Revert "Added Guest default customer group with id 0" 2019-06-15 15:10:11 +05:30
jitendra e26c2b4d89 Added Guest default customer group with id 0 2019-06-14 16:41:18 +05:30
Prashant Singh 23467d9389 Added message when seller is blocked 2019-06-13 06:37:16 +05:30
Prashant Singh c86a699f69 Added status check in customer auth session creation function 2019-06-13 06:34:46 +05:30
Prashant Singh 619b8b6c8b Added status and notes in customer model fillables 2019-06-13 06:28:29 +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
rahul shukla d232722b5d issue #916 2019-06-04 12:49:10 +05:30
rahul shukla b5eff8b47e issue #942 2019-05-27 18:25:30 +05:30
rahul shukla 568e6ff7c8 change for group 2019-05-21 12:46:43 +05:30
shenjiayu 8eea13db2d utilise Mail::queue to send emails 2019-05-01 21:31:03 +10:00