c7add7e2fe
removal of excess code in search, locale & currency
2019-07-08 13:10:41 +05:30
2f2f97a6d0
category check condition for sorting
2019-07-05 13:33:06 +05:30
f9863f440f
category check condition for sorting
2019-07-05 13:24:46 +05:30
cfaee2f432
issue #1147
2019-07-04 13:56:18 +05:30
9eb4b89344
json removed
2019-07-04 13:25:08 +05:30
44a72db99e
maximum price according to category
2019-07-04 13:20:21 +05:30
60435b724f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-04 12:38:36 +05:30
c56d94f7a4
issue #968 and dependent field
2019-07-04 12:38:20 +05:30
f529a128cd
Removed unnecessary code from sevice providers
2019-07-01 20:03:16 +05:30
b7d346260a
Resolve conflicts
2019-07-01 17:12:44 +05:30
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
e9608d87ef
Merge pull request #1143 from prashant-webkul/development
...
Development
2019-06-29 18:49:00 +05:30
e0bbae7f8a
Try catch handler in move to cart from wishlist
2019-06-29 18:47:22 +05:30
3ef416b22e
Added downloadable order item info
2019-06-29 17:51:49 +05:30
ad6e422fdb
Added downloadable and virtual products
2019-06-29 15:23:34 +05:30
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
e6c20fa11e
table in email template
2019-06-28 17:20:47 +05:30
34fd4e3840
assets compile for production
2019-06-28 17:11:26 +05:30
d5b66ebf9e
table in email template
2019-06-28 17:05:08 +05:30
8a5d57bcc6
new compiled assets for production
2019-06-28 16:30:36 +05:30
fce7ec8586
Assets compiled for production and updated the changelog for new release v0.1.6
2019-06-28 16:29:41 +05:30
e8dd4219a7
Apply on shipping working on cart rule
2019-06-28 12:57:19 +05:30
4339475e70
CheckOnShipping method added to check where rule applies on shipping or not
2019-06-27 19:55:36 +05:30
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
79b5e1c4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 14:38:48 +05:30
a9090e991c
download for image & file type
2019-06-27 14:38:24 +05:30
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
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
8a37088b9f
Omitted the applicable rules that gives 0 value discounts
2019-06-27 02:25:44 +05:30
72cf1c0226
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 01:36:18 +05:30
6d40b54d1d
Remote sync
2019-06-27 01:36:11 +05:30
c783ffa966
Added more checks for noncouponable and couponable rule interfaces
2019-06-27 01:32:32 +05:30
73d9966a12
Fixed issue #1108
2019-06-26 16:42:53 +05:30
9a92a61724
try & catch added in buynow
2019-06-26 16:40:15 +05:30
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
ecd766cb81
Some changes in frontend regarding coupon form on checkout
2019-06-25 14:57:26 +05:30
b0efd192e2
removed undefined variable rule from checkout/save payment
2019-06-24 18:03:31 +05:30
7d2b751479
issue #1015 pagination responsive
2019-06-21 16:17:37 +05:30
a35c997a56
issue #1014
2019-06-21 15:01:51 +05:30
ba26a39f74
issue #951
2019-06-21 14:41:22 +05:30
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
d76d8bd129
flash message for discount & error
2019-06-19 21:18:16 +05:30
144bda6590
review page render in onepage
2019-06-19 17:08:36 +05:30
de445279d2
Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules
2019-06-19 16:27:32 +05:30
aa1a5451bd
Fixed checkout summary refresh issue
2019-06-19 15:15:27 +05:30
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
210be70779
Merge pull request #1049 from prashant-webkul/development
...
all calculations now changed to base price
2019-06-18 19:02:39 +05:30
3af3996439
buy now issue
2019-06-18 17:42:11 +05:30
82d916c646
cart rule action percent of product changed to base price of item
2019-06-17 16:20:53 +05:30
4b99f5acf9
Summary template now re rendering on applying and removal of coupon
2019-06-17 14:16:51 +05:30
c2c0836b85
Couponable rule getting over ride by previously applied non-couponable rule
2019-06-17 13:09:21 +05:30
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
15abe379e0
Changed frontend attributes and syntax fixes in checkout
2019-06-16 17:26:06 +05:30
b93bc11c65
Fixed js error in checkout page
2019-06-15 22:28:21 +05:30
27b4ee19e5
Checkout coupon apply issue fixed
2019-06-15 22:22:40 +05:30
9ae4f8a801
Fixed issues with cart rule customer groups
2019-06-15 18:47:53 +05:30
1f5d8a8f28
Revert "Revert "Development""
2019-06-15 16:50:37 +05:30
545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:02 +05:30
c06bc39a7f
Merge pull request #1037 from bagisto/revert-1033-development
...
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:13:43 +05:30
ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development
...
Revert "buy now issue"
2019-06-15 15:13:16 +05:30
fb5687c451
Revert "buy now issue"
2019-06-15 15:10:10 +05:30
668f92185b
Revert "Development"
2019-06-15 15:10:04 +05:30
7ac715e93d
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:09:59 +05:30
0927786cee
Fixed issue with order summary rendering on cart page
2019-06-15 14:56:24 +05:30
eaa755bbea
Fixed discount on frontend
2019-06-15 13:13:07 +05:30
fc43b158dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-15 10:49:04 +05:30
3a8b923f5c
Discount rule
2019-06-14 23:48:08 +05:30
076f197de7
buy now issue
2019-06-14 21:04:22 +05:30
c36950c609
applied translation string in apply coupon responses
2019-06-14 20:26:54 +05:30
0188644fce
Prepared standard responses when applying couponable rules
2019-06-14 20:04:32 +05:30
bb097be557
Added error message provision in the same when coupon application fails
2019-06-14 19:58:25 +05:30
bec9ebe7fb
coupon section fix in review-order component
2019-06-14 19:52:58 +05:30
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
da82f2935c
removed some dead code
2019-06-14 17:55:03 +05:30
3f814d9253
Fixed checkout issue
2019-06-14 15:13:20 +05:30
8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
...
Fixed checkout issue
2019-06-14 15:00:15 +05:30
5b81968bae
Fixed checkout issue
2019-06-14 14:59:29 +05:30
4bfefd3a07
base sync
2019-06-14 13:22:37 +05:30
c52238e45e
Cart rule frontend normalization
2019-06-14 13:21:17 +05:30
7f9409bd8e
Checkout and cart page now coupled with cart rules
2019-06-14 12:10:03 +05:30
e9a0588185
discount rule fixes
2019-06-13 22:19:44 +05:30
5afef79ac2
merge with master
2019-06-13 20:24:52 +05:30
6e8c0da054
Fixed conflicts
2019-06-13 19:48:30 +05:30
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +05:30
abf46c8a99
Added discount amount in cart item table
2019-06-13 19:30:00 +05:30
a27bae1c2d
All assets compiled for production
2019-06-13 19:08:42 +05:30
0fc78c5d83
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
2019-06-13 14:51:24 +05:30
23467d9389
Added message when seller is blocked
2019-06-13 06:37:16 +05:30
4542c96b17
Fixed issue in core regarding buynow button passing static quantity as 1 is now removed
2019-06-12 15:16:06 +05:30
6a8c7a8784
assests compile for production
2019-06-11 16:40:13 +05:30
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
5585b503cf
Car controller updated
2019-06-07 16:36:50 +05:30
ca4d9ef9ba
Fixed js issue buy now button not exist
2019-06-07 15:42:58 +05:30
af67516c36
object added with event
2019-06-06 15:16:16 +05:30
255664c4c0
back button implemented on checkout page
2019-06-04 16:36:42 +05:30
fc456c785f
issue #850
2019-06-03 16:29:00 +05:30
96e8556b54
Fixed mini cart layout
2019-05-31 18:30:09 +05:30
8202f58284
Issue #932 fixed
2019-05-31 17:52:52 +05:30
445b648b0a
Issues #948 , #949 fixed
2019-05-30 18:32:01 +05:30
49d8388d49
Merge pull request #962 from rahulshukla-webkul/development
...
UI fixes for project
2019-05-30 13:25:59 +05:30
3663391bf6
UI fixes for project
2019-05-30 11:52:06 +05:30
3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development
...
Development
2019-05-29 11:48:55 +05:30
d1199a6f26
issue #956
2019-05-29 11:35:17 +05:30
eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
...
Development
2019-05-28 17:06:25 +05:30
b5eff8b47e
issue #942
2019-05-27 18:25:30 +05:30
c4a9d04e72
file & image attribute
2019-05-27 16:51:27 +05:30
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
27812ccd15
shipping title & footer text
2019-05-22 18:45:47 +05:30
7888656d4c
down icon & product edit icon
2019-05-21 20:11:36 +05:30
30942b3d25
product page changes
2019-05-21 19:36:20 +05:30
898214e81e
issue #925
2019-05-21 12:00:43 +05:30
ce99a4d9bb
icon issue in layred navigation #issue 903
2019-05-09 12:28:48 +05:30
3486983b1d
IE completed & redirect customer route
2019-05-08 17:52:54 +05:30
6f494cc04b
IE changes
2019-05-07 21:09:27 +05:30
b52dc978e8
Admin section for IE & dyanamic footer content
2019-05-07 18:57:33 +05:30
b4a95b8d0c
cart pages changes
2019-05-06 21:15:26 +05:30
1b3653348d
front end changes for IE
2019-05-06 20:52:43 +05:30
87b732898d
add & remove at cart page
2019-05-06 13:06:16 +05:30
2816dd01e5
Merge branch 'master' into development
2019-05-01 22:38:42 +10:00
52bc554e31
Merge pull request #895 from prateek-webkul/development
...
admin mail notification, review price
2019-05-01 17:58:12 +05:30
8eea13db2d
utilise Mail::queue to send emails
2019-05-01 21:31:03 +10:00
ca08b9a133
rtl css chages for category
2019-04-30 14:48:43 +05:30
4c101aa646
admin mail notification, review price
2019-04-30 12:55:11 +05:30
507a41546d
issue #890
2019-04-30 12:40:35 +05:30
2674fbb9ca
issue #850
2019-04-26 15:31:01 +05:30
723ecc88d9
Merge pull request #871 from jitendra-webkul/jitendra
...
Update Cart in order make compatible for api and session guard
2019-04-24 15:57:07 +05:30
ee056ee917
Update Cart in order make compatible for api and session guard
2019-04-24 15:55:49 +05:30
1f86376ffe
Merge pull request #870 from jitendra-webkul/jitendra
...
Configurable product add to cart issue fixed
2019-04-24 15:10:30 +05:30
ac03710f07
Configurable product add to cart issue fixed
2019-04-24 15:09:55 +05:30
8b0787ad53
issue #835
2019-04-24 14:45:57 +05:30
e52c426600
dashboard & issue #841
2019-04-23 16:20:33 +05:30
9903d23dfe
change in category menu
2019-04-23 15:38:11 +05:30
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
b5c762b528
Created new route for 404 page
2019-04-23 12:43:42 +05:30
c585186a88
Issue #840 fixed
2019-04-23 10:33:10 +05:30
7e826bef00
Issue #840 fixed
2019-04-18 15:50:03 +05:30
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
13ac4a9571
issue #824
2019-04-17 15:21:48 +05:30
58ddc68520
issues
2019-04-17 12:56:33 +05:30
ad6acfa7e0
issue #824
2019-04-16 20:15:28 +05:30
3e97bacf91
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 19:19:26 +05:30
7fc68c56ae
Added product id attribute to model
2019-04-16 16:37:52 +05:30
dd90e63ade
Fixed add to cart issue
2019-04-16 16:32:30 +05:30
1dd23a5a39
Changed varaible name productFlat to product in product card page
2019-04-16 16:02:04 +05:30
4e56374c70
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 16:01:37 +05:30
700a2951e6
added related products and up sells to the product view page
2019-04-16 15:57:38 +05:30
a4bb5a036b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 15:55:42 +05:30
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
d568ea4bbe
merge with master
2019-04-16 15:35:54 +05:30
36f6c425c2
Assets compiled for production
2019-04-15 15:14:32 +05:30
feaaaa89a5
fixed some style issues
2019-04-14 15:30:43 +05:30
ee889cc259
upgrade code of zoom
2019-04-12 16:40:45 +05:30
1caa3eb4f6
image zoom in rtl
2019-04-12 14:11:05 +05:30
07b6ac6903
limit for up_sell, cross_sell & related product
2019-04-12 13:05:45 +05:30
2a859b7e23
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 15:08:15 +05:30
b99b0ad8b5
product attribute & category menu
2019-04-10 15:08:01 +05:30
ebc0befe6a
Merge pull request #813 from naresh-webkul/development
...
Development
2019-04-10 13:25:43 +05:30
d1e38fe83b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 12:12:15 +05:30
f3f61e3c91
Optimized performance
2019-04-10 12:10:46 +05:30
4f999ee34a
changed shipment table content
2019-04-09 19:40:43 +05:30
ab4c054292
changed shipment table
2019-04-09 18:52:44 +05:30
e5d71fa280
change in jquery for wishlist icon for zoom
2019-04-09 17:59:58 +05:30
b0296a02e0
inventory source mail
2019-04-09 17:04:20 +05:30
7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
...
Development
2019-04-09 15:52:46 +05:30
6a7f247d7a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 15:30:52 +05:30
6b247993e4
Theme finder issue fixed (Shop changes was reflecting in admin)
2019-04-09 15:22:45 +05:30
a3999d7a23
merge with master
2019-04-09 15:13:26 +05:30
9d89ec816d
comment, variable name changes
2019-04-09 14:17:18 +05:30
09aa34b36a
issue #749 fixed again & reduce query
2019-04-09 14:05:57 +05:30
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
75ef9cd530
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 12:50:09 +05:30
09d6afc72a
Implemented customer configuration based features:
...
1. Email Verification.
2. Email Subscription.
2019-04-09 08:03:31 +05:30
2df1a84191
Security fix underway need pull from other branches
2019-04-08 19:46:19 +05:30
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
82e56334c2
Fixed modal style issues, localization of routes issue and updated description string of version command
2019-04-07 06:30:55 +05:30
c7482f576e
Some styles fixes on auth pages of customer and footer bottom
2019-04-07 03:44:18 +05:30
61fd02ed57
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 19:38:56 +05:30
fdb6284856
issue #760 wishlist
2019-04-05 16:54:09 +05:30
5c94a8a21f
changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui
2019-04-04 14:50:59 +05:30
23bb48e759
Development ( #790 )
...
* issue #753 swatch issue
* edit validation for swatch
* #783 product image with installer
* issue #773
* removal of view composers in shop
* issue #785 product name display
* merge with master & assests compile
2019-04-03 12:17:47 +05:30
9314d9159c
Development ( #789 )
...
* issue #753 swatch issue
* edit validation for swatch
* #783 product image with installer
* issue #773
* removal of view composers in shop
2019-04-03 11:37:48 +05:30
39acb0de43
merge with master
2019-04-02 13:26:39 +05:30
9e58602262
issue #758
2019-04-02 13:24:11 +05:30
95ea54d220
Merge pull request #779 from prashant-webkul/development
...
Fixed issue #775
2019-04-02 10:27:43 +05:30
9c55f5037d
Fixed issue #775
2019-04-02 09:39:43 +05:30
56142bf3d8
issue #759
2019-04-01 20:00:54 +05:30
0bd03c2c62
Merge pull request #769 from cagartner/feature/add-id-streetlines
...
Added id attribute to streetlines
2019-04-01 15:15:24 +05:30
06aa4dd6bf
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:45:56 +05:30
40ebb3a0c4
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:43:44 +05:30
4a2efc8eee
fixed issue #749
2019-04-01 01:32:58 +05:30
b8d78ab00d
Added id attribute to streetlines
2019-03-31 15:35:07 -03:00
ea99fc8c68
fixed issue 764
2019-03-31 22:41:14 +05:30
1d372621ce
Security fix for customer information and fixed issue #762
2019-03-30 18:55:10 +05:30
257dfc8b1e
rtl css for product list & currency capital
2019-03-29 16:48:00 +05:30
8897a27499
issue #730
2019-03-29 13:11:49 +05:30
rahul shukla
jitendra
Jitendra Singh
Prashant Singh
Prashant Singh
Jiayu Shen
shenjiayu
prateek srivastava
naresh verma
rahulshukla-webkul
Carlos Augusto Gartner