Herbert
4261590102
add resources/manifest.php skeletons for Webkul packages
2019-11-13 12:02:56 +01:00
Jitendra Singh
ede889703e
Merge pull request #1737 from jitendra-webkul/jitendra
...
Issue #1347 fixed
2019-11-05 12:45:22 +05:30
jitendra
8347e1770b
Issue #1347 fixed
2019-11-05 12:44:26 +05:30
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
973332f6c0
Issue #1724 fixed
2019-11-01 11:03:40 +05:30
jitendra
ab2d069ec7
Issue #1519 fixed
2019-10-31 17:07:49 +05:30
jitendra
62533d9df8
postcode column changed to varchar from int
2019-10-24 17:38:08 +05:30
jitendra
dfb9c75e77
Move wishlist to cart issue fixed
2019-10-24 17:08:41 +05:30
jitendra
5f0b26f038
Bundle product add to cart issue fixed
2019-10-24 16:29:09 +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
0864dd5d1a
Issue #1592 fixed
2019-10-11 12:11:07 +05:30
jitendra
210a19757f
Issue #1574 fixed
2019-10-10 17:41:30 +05:30
jitendra
6384b84746
Resolve conflicts
2019-09-11 13:16:37 +05:30
jitendra
e250bc0602
Tax not getting applied if only order is placed for virtual product and downloadable product or for both.
2019-09-11 12:31:25 +05:30
jitendra
1ce4dfea95
Merge cart issue fixed for downloadable product
2019-09-11 11:21:12 +05:30
Matt April
a8141c3fb3
Change 'self' references inside models to 'static'. This fixes issues when models are overriden, but he base class continues to references itself rather than the new model.
2019-09-07 20:14:27 -04:00
jitendra
eafa585cb8
Order creation completed for bundle product
2019-09-03 15:46:13 +05:30
jitendra
557cbb1db1
Bundle add to cart added
2019-08-30 17:09:15 +05:30
Prashant Singh
1e0da3c42a
Fixed issue #778
2019-08-29 16:11:12 +05:30
jitendra
ec567d624f
Db schema, models and repositories added for bundle type product
2019-08-20 17:57:39 +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
rahul shukla
561803cd3c
filterable attribute for category, tax price update on cart and issue #1234
2019-07-31 17:44:29 +05:30
jitendra
f529a128cd
Removed unnecessary code from sevice providers
2019-07-01 20:03:16 +05:30
jitendra
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
Prashant Singh
be2b55a898
fixed event fire on movetocart from wishlist
2019-06-29 18:44:23 +05:30
jitendra
f08a8036e6
Resolved conflict
2019-06-29 17:57:10 +05:30
Prashant Singh
e3bc993c99
Added cart item add before event
2019-06-29 17:24:41 +05:30
Prashant Singh
ec2baa1be9
bug fix for event fire
2019-06-29 17:07:19 +05:30
Prashant Singh
ff863fcc54
Added cart item add after event for move to cart from wishlist
2019-06-29 17:04:18 +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
Prashant Singh
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
Jitendra Singh
0102dd0c30
Merge pull request #1111 from prashant-webkul/development
...
Development
2019-06-27 11:45:23 +05:30
Prashant Singh
3e4d2603c4
Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount
2019-06-27 04:35:26 +05:30
rahul shukla
54fa3419f3
admin name for attribute
2019-06-26 21:03:52 +05:30
rahul shukla
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
Prashant Singh
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
Prashant Singh
8d68be8e07
Rule condition discount calculation now working properly
2019-06-15 12:27:54 +05:30
Prashant Singh
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
Prashant Singh
da82f2935c
removed some dead code
2019-06-14 17:55:03 +05:30
Prashant Singh
4bfefd3a07
base sync
2019-06-14 13:22:37 +05:30
Prashant Singh
c52238e45e
Cart rule frontend normalization
2019-06-14 13:21:17 +05:30
Prashant Singh
7f9409bd8e
Checkout and cart page now coupled with cart rules
2019-06-14 12:10:03 +05:30
Prashant Singh
e9a0588185
discount rule fixes
2019-06-13 22:19:44 +05:30
jitendra
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +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
jitendra
c6a44b5414
Updated cart for custom_price
2019-06-07 11:18:46 +05:30
rahul shukla
dc96dfb7b2
custom price default to null
2019-06-07 11:12:40 +05:30
rahul shukla
f924e7ed01
custom price nullable in cart items
2019-06-07 10:06:00 +05:30
rahul shukla
fc456c785f
issue #850
2019-06-03 16:29:00 +05:30
Jitendra Singh
746d7e5204
Merge pull request #965 from rahulshukla-webkul/development
...
Development
2019-05-31 13:20:27 +05:30
rahul shukla
12e93b3f58
cart updated for convert price
2019-05-31 12:48:04 +05:30
jitendra
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
rahul shukla
f434024827
change datatype of post code
2019-05-22 17:03:48 +05:30
jitendra
c4c55bc48d
Refactored cart class
2019-04-24 17:09:46 +05:30
jitendra
28fc43fbfa
Fixed guard spell mistake
2019-04-24 16:05:29 +05:30
jitendra
ee056ee917
Update Cart in order make compatible for api and session guard
2019-04-24 15:55:49 +05:30
jitendra
dd90e63ade
Fixed add to cart issue
2019-04-16 16:32:30 +05:30
jitendra
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
Prashant Singh
b59c25bfb8
Bug fix
2019-03-19 16:19:41 +05:30
jitendra
42b5f91764
Feature Request #666 implented
2019-03-12 11:59:00 +05:30
Prashant Singh
7ae4be56b8
fixed issue #642 , made changes in layout of checkout section, various display bugs had been fixed
2019-03-05 16:28:55 +05:30
rahul shukla
b019a248cf
interfaces & proxy class implemented
2019-02-18 13:00:40 +05:30
rahul shukla
704f6851a3
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-15 20:10:58 +05:30
rahul shukla
36cb09bc58
address while checkout & reduces code
2019-02-15 20:10:47 +05:30
jitendra
d2f620bb9f
Issue fixed (If configurable product added to cart without options)
2019-02-15 19:38:10 +05:30
rahul shukla
0b0f425bf4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-15 11:29:05 +05:30
rahul shukla
4a648f549a
checkout with multiple address #210
2019-02-14 21:20:10 +05:30
Prashant Singh
550cabcbcb
Translation strings for datagrid and removal of dead code and pretty syntax
2019-02-14 19:24:44 +05:30
Prashant Singh
ad1b2c5f7c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-04 15:29:33 +05:30
jitendra
49ddcd0256
Issue #191 fixed
2019-02-04 15:18:24 +05:30
Prashant Singh
8f78d8f2be
issue #368 readdressed and same fix applied again after reviewal
2019-02-04 15:14:02 +05:30
Prashant Singh
072d61f20e
Wishlist move to cart when product quantity is exhausted, showing improper validation message. Issue #402 fixed.
2019-02-04 13:51:26 +05:30
Prashant Singh
3a69f76b96
Fixed issue #368
2019-01-29 16:05:30 +05:30
jitendra
aae6593469
Coding standard updated
2019-01-15 17:24:41 +05:30
jitendra
ce06916b3a
Cart issue fixed
2019-01-07 17:27:07 +05:30
jitendra
264e2b2a16
Cart item custom price implemented
2019-01-07 16:40:26 +05:30
jitendra
16cb592130
Event added to cart
2019-01-07 16:00:28 +05:30
rahul shukla
b430d4d4b5
merge with master
2019-01-02 20:15:05 +05:30
jitendra
98e2d0e52c
Merged with master
2019-01-02 20:07:00 +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
Prashant Singh
0a2a6c4234
conflicts in class attribute of storefront search and datagrid's search box
2018-12-27 16:22:44 +05:30
Prashant Singh
2b8e198d0d
cart customer details fetched when user logged in
2018-12-21 18:48:31 +05:30
Prashant Singh
6fba17ea81
Fixed issues #300 & Updated inventory in product grid after order received
2018-12-21 16:14:20 +05:30
prashant-webkul
510f6e6f63
minor fixes in the merge cart function of cart
2018-12-03 18:37:29 +05:30
prashant-webkul
1ba21f281d
Cart flash message fixed
2018-11-30 13:24:54 +05:30
prashant-webkul
36f6783db8
cart bug fixes and small css fix
2018-11-30 13:10:41 +05:30
Prashant Singh
6758e05b95
Merge pull request #196 from bagisto/prashant
...
Prashant
2018-11-28 14:54:46 +05:30
prashant-webkul
311701b00a
tax category sync fix and select rates fixed
2018-11-28 14:05:44 +05:30
jitendra
0e38750e37
Issue #192 (Issue with different shipping address)
2018-11-28 13:30:41 +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
jitendra
fb0079bf42
Fixed validation error messages
2018-11-27 10:16:35 +05:30
prashant-webkul
f93716a801
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-11-26 10:27:07 +05:30
prashant-webkul
4e6c462317
onepage cart api implemented
2018-11-25 19:13:30 +05:30
jitendra
4c21d8ead6
Issues #134 fixed and Inventory source add/edit validation issue fixed
2018-11-21 16:44:07 +05:30
prashant-webkul
1c27444705
merged
2018-11-21 12:04:54 +05:30
prashant-webkul
98198a73fa
Buy Now Fixes
2018-11-17 11:56:10 +05:30
prashant-webkul
82a3142c73
subscription mails bug fix
2018-11-16 18:28:41 +05:30
prashant-webkul
8c12e35621
Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid
2018-11-16 17:21:10 +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
prashant-webkul
3a801a5d72
Pre Loaded
2018-11-05 10:25:05 +05:30
prashant-webkul
a792f4e06b
Buy Now and Wishlist Complete
2018-10-30 16:52:36 +05:30
prashant-webkul
f0c5db8177
before merge
2018-10-30 11:59:44 +05:30
prashant-webkul
b55720244c
Move Configurable Item To Cart From Wishlist Bug Removed and Storefront UI Fix
2018-10-30 11:49:22 +05:30
prashant-webkul
e59f5a775b
Order Grid, Wishlist Bug Fixes
2018-10-30 10:01:01 +05:30
prashant-webkul
e2c036ced0
Search and Bug fixes
2018-10-29 11:39:09 +05:30
prashant-webkul
32af436609
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-10-26 19:15:54 +05:30
prashant-webkul
e3ce3ae45d
slider fixes
2018-10-26 19:15:51 +05:30
JItendra Singh
7d68e20de6
Merge pull request #93 from bagisto/prashant
...
Prashant
2018-10-26 19:14:05 +05:30
jitendra
27b1f1fad9
Issues fixed
2018-10-26 19:13:01 +05:30
prashant-webkul
5d3047a0b4
Cart bug fixes and order datagrid bug fixes
2018-10-26 17:53:25 +05:30
prashant-webkul
462dc9fafb
Bug Fixes
2018-10-26 12:35:19 +05:30
jitendra
7c63dac032
Fixed remaining issues
2018-10-26 09:50:43 +05:30
prashant-webkul
dc939d4ff2
Addition data for adding configurable product to cart, fixed
2018-10-25 15:33:49 +05:30
prashant-webkul
ef37be5eca
Merge with master
2018-10-25 15:26:24 +05:30
jitendra
210da46a12
Issue fixed
2018-10-25 15:25:10 +05:30
prashant-webkul
1b83b23e53
merged with conflicted assets, recompile storefront
2018-10-25 13:51:03 +05:30
prashant-webkul
683b18e424
Cart Bug Fixes and Category items fixes for visible in menu only
2018-10-25 13:49:23 +05:30
jitendra
930cba9436
Issues fixed
2018-10-25 13:16:45 +05:30
prashant-webkul
701c8e3602
Wishlist move to cart code is tested and its working fine
2018-10-22 16:10:05 +05:30
prashant-webkul
371d2bb742
Wrote the code for moving configurable product to the wishlist
2018-10-18 17:42:41 +05:30
jitendra
70c47f44a9
Fixed cart issues
2018-10-18 15:01:19 +05:30
prashant-webkul
5fb2f78039
Merged with Master
2018-10-17 12:56:34 +05:30
jitendra
d3b73f517c
Sales email templates added
2018-10-17 12:51:47 +05:30
prashant-webkul
3a17aacd90
Wishlist Move To Cart For Simple Products Done
2018-10-15 20:18:58 +05:30
jitendra
7f1675e37c
Order cancel implemented
2018-10-15 16:09:09 +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
prashant-webkul
0c47cbc282
Bug fixes
2018-10-12 13:52:21 +05:30
jitendra
71ea17d9d7
Performence Optimized
2018-10-12 13:52:06 +05:30
prashant-webkul
a631a07674
Bug fixes and cart operations optimization
2018-10-12 12:51:39 +05:30
JItendra Singh
7a7e25b11d
Merge pull request #48 from bagisto/jitendra
...
Tax calculation
2018-10-11 11:43:49 +05:30
jitendra
1b06082e2e
Tax calculation
2018-10-11 11:42:39 +05:30
prashant-webkul
60c930c401
Merged w/ master
2018-10-11 11:12:17 +05:30
jitendra
392ceadf53
Refactor cart
2018-10-11 11:09:17 +05:30
prashant-webkul
d26758e49a
Merged
2018-10-10 16:13:51 +05:30
prashant-webkul
34d4a1c3a4
Before Merge
2018-10-10 16:11:33 +05:30
jitendra
6f57a51152
Fixed cart issues
2018-10-10 15:56:27 +05:30
jitendra
426933a4bb
Home new products
2018-10-10 11:20:47 +05:30
prashant-webkul
b6df4e1dc8
Merged with master
2018-10-10 10:19:30 +05:30
prashant-webkul
36102ac040
Bug fixes in tax rate and categories
2018-10-09 17:34:25 +05:30
jitendra
d00bb078a1
Shipment and invoice creation completed
2018-10-09 17:32:22 +05:30
jitendra
f87a47d798
Order creation completed
2018-10-05 17:29:43 +05:30
prashant-webkul
0177d889c3
Merged with master
2018-10-05 11:53:00 +05:30
prashant-webkul
c9da9491a6
Before merge
2018-10-05 11:49:30 +05:30
jitendra
a9106e0486
Order create
2018-10-05 11:48:58 +05:30
prashant-webkul
adc7052afa
Cart Dependency Resolved From Composer to Global helpers and removed the form field check for the cart operations of add, remove and update
2018-10-04 19:46:23 +05:30
prashant-webkul
9018d5cadf
Cart Bug Fixes
2018-10-04 16:22:59 +05:30
prashant-webkul
fc7cfd7d81
Cart Bug fixes -> Cart page intolerant to totals, fixed by executing helpers before redirecting on success.
2018-10-04 15:58:44 +05:30
prashant-webkul
1c667b332c
Merged with master
2018-10-04 12:24:32 +05:30
prashant-webkul
3fffbacb49
Before merge
2018-10-04 12:13:49 +05:30
jitendra
c235c22e79
Order creation
2018-10-04 12:12:06 +05:30
prashant-webkul
519c2e4815
Cart Dropdown, Responsive improvements for product grids at various places.
2018-10-03 16:01:33 +05:30
jitendra
c1a657f3c8
Configurable option on cart page
2018-10-01 12:37:46 +05:30
prashant-webkul
45ed88c4e6
re-merge
2018-10-01 12:36:59 +05:30
JItendra Singh
2c3a505fc6
Merge pull request #32 from bagisto/prashant
...
Cart Bugs Fixes
2018-10-01 12:09:26 +05:30
jitendra
f57e0c6720
Configurable option on cart page
2018-10-01 12:07:32 +05:30
prashant-webkul
f69b000052
Cart Bugs Fixes
2018-09-28 19:44:54 +05:30
prashant-webkul
34833ff995
Path Errors Fixed
2018-09-28 18:58:54 +05:30
prashant-webkul
41fb4a6407
Merged with Master
2018-09-28 18:39:42 +05:30
jitendra
0bb851d518
Sale package schema added and renamed package cart to checkout
2018-09-28 18:24:26 +05:30