Prashant Singh
05c5425c96
Added home page SEO under channel edit and create forms and fixed issue #1319
2019-08-21 13:38:07 +05:30
jitendra
ec567d624f
Db schema, models and repositories added for bundle type product
2019-08-20 17:57:39 +05:30
Jitendra Singh
fbf5da570e
Merge pull request #1318 from prashant-webkul/development
...
Development
2019-08-20 12:07:58 +05:30
Prashant Singh
8744c84eb9
product card hover padding removed
2019-08-20 10:48:17 +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
Jitendra Singh
59cfd13795
Merge pull request #1307 from prashant-webkul/development
...
Development
2019-08-16 17:50:18 +05:30
Prashant Singh
bd6e0c9345
Structural changes in CMS pages. Fixed bugs #1300 , #1295
2019-08-16 17:43:58 +05:30
Jitendra Singh
39a195f923
Merge pull request #1296 from prashant-webkul/development
...
Development
2019-08-14 14:55:44 +05:30
rahul shukla
6609587387
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-08-14 12:03:52 +05:30
rahul shukla
909dbb51f0
condition changes for category filter
2019-08-14 12:02:30 +05:30
Prashant Singh
da093662db
Catalog rule implementation in progress
2019-08-12 06:56:21 +05:30
Hossein
578d0c7b94
Create Persian language file
2019-08-10 10:28:16 +04:30
Prashant Singh
06a4f1216b
Dead code removal
2019-08-09 19:29:28 +05:30
Jitendra Singh
a849ae9fc0
Merge pull request #1272 from prashant-webkul/development
...
Development
2019-08-09 19:12:44 +05:30
Prashant Singh
bb12e07212
Cart rules refactored
2019-08-08 05:53:28 +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
763a380870
new customer notification, isssue #1247
2019-08-05 20:23:48 +05:30
Prashant Singh
c751c16e6a
Cart rule refactorization
2019-08-05 19:38:17 +05:30
rahul shukla
508bf188ce
Issue #1239
2019-08-05 19:14:10 +05:30
Prashant Singh
e4a5e84fb6
Refactoring cart rules
2019-08-03 19:54:02 +05:30
Prashant Singh
9ca97aa594
CMS implemented
2019-08-02 19:51:28 +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
rahul shukla
561803cd3c
filterable attribute for category, tax price update on cart and issue #1234
2019-07-31 17:44:29 +05:30
rahul shukla
3a7e481d01
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-30 20:09:55 +05:30
rahul shukla
39139f26ca
Issues #1228 and #1229
2019-07-30 13:45:13 +05:30
Jitendra Singh
41510db280
Merge pull request #1202 from moe2566/master
...
Add text direction configuration for locales
2019-07-30 11:48:56 +05:30
rahul shukla
dbff16b8b7
disabale zoom on mobile devices
2019-07-29 12:07:39 +05:30
rahul shukla
29763b902e
issue of image at checkout #1209
2019-07-24 18:50:44 +05:30
rahul shukla
97320b52ea
assests compile for production
2019-07-24 10:40:51 +05:30
Moshe Lustigman
a0ba845e37
Add text direction configuration for locales
2019-07-23 18:05:57 -04:00
rahul shukla
cff63acfc8
reverting changes
2019-07-23 17:49:24 +05:30
rahul shukla
9cd9846d65
set locale on session if not available
2019-07-23 17:47:19 +05:30
rahul shukla
f4eb973ba6
reduces number of loop for filter attribute #1192
2019-07-23 15:57:49 +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
3200cbafc6
Issue #1190 .
2019-07-19 16:30:01 +05:30
Arpad
4a941e461c
Forget password notification Subject translation
2019-07-17 14:36:00 +02:00
Arpad
2c3467e611
Forgot password back link translation
2019-07-17 09:30:36 +02:00
rahul shukla
1ec288a182
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-15 17:04:10 +05:30
rahul shukla
67bb7704e7
merge with master
2019-07-15 17:03:54 +05:30
Alexey
5856d00e4b
Update search.blade.php
...
Use TOTAL instead of COUNT
2019-07-14 17:27:34 +04:00
Prashant Singh
f8a4f1ba1c
product card hover transition applied and reduced hover padding by 33%
2019-07-14 12:38:15 +05:30
Prashant Singh
caf165d06c
Fixed issue with image of product card getting cropped due to CSS
2019-07-14 12:25:57 +05:30
Prashant Singh
42d067c44a
Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development
2019-07-14 07:30:16 +05:30
Prashant Singh
5f08f2b9f4
Fixed sort order for configuration in admin panel
2019-07-14 00:46:33 +05:30
rahul shukla
78d44a8be0
rtl css for slider
2019-07-11 19:53:18 +05:30
Prashant Singh
7ffbee95ad
Shipping methods and payment methods description converted to translation string
2019-07-11 10:16:58 +05:30
rahul shukla
cc4dfcad76
issue #1160 , filterable attribute & configuration updated for validation
2019-07-09 14:47:40 +05:30
rahul shukla
c7add7e2fe
removal of excess code in search, locale & currency
2019-07-08 13:10:41 +05:30
rahul shukla
2f2f97a6d0
category check condition for sorting
2019-07-05 13:33:06 +05:30
rahul shukla
f9863f440f
category check condition for sorting
2019-07-05 13:24:46 +05:30
rahul shukla
cfaee2f432
issue #1147
2019-07-04 13:56:18 +05:30
rahul shukla
9eb4b89344
json removed
2019-07-04 13:25:08 +05:30
rahul shukla
44a72db99e
maximum price according to category
2019-07-04 13:20:21 +05:30
rahul shukla
60435b724f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-04 12:38:36 +05:30
rahul shukla
c56d94f7a4
issue #968 and dependent field
2019-07-04 12:38:20 +05:30
jitendra
f529a128cd
Removed unnecessary code from sevice providers
2019-07-01 20:03:16 +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
3ef416b22e
Added downloadable order item info
2019-06-29 17:51:49 +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
e6c20fa11e
table in email template
2019-06-28 17:20:47 +05:30
rahul shukla
34fd4e3840
assets compile for production
2019-06-28 17:11:26 +05:30
rahul shukla
d5b66ebf9e
table in email template
2019-06-28 17:05:08 +05:30
Prashant Singh
8a5d57bcc6
new compiled assets for production
2019-06-28 16:30:36 +05:30
Prashant Singh
fce7ec8586
Assets compiled for production and updated the changelog for new release v0.1.6
2019-06-28 16:29:41 +05:30
Prashant Singh
e8dd4219a7
Apply on shipping working on cart rule
2019-06-28 12:57:19 +05:30
Prashant Singh
4339475e70
CheckOnShipping method added to check where rule applies on shipping or not
2019-06-27 19:55:36 +05:30
Prashant Singh
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
rahul shukla
79b5e1c4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 14:38:48 +05:30
rahul shukla
a9090e991c
download for image & file type
2019-06-27 14:38:24 +05:30
jitendra
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +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
Prashant Singh
8a37088b9f
Omitted the applicable rules that gives 0 value discounts
2019-06-27 02:25:44 +05:30
Prashant Singh
72cf1c0226
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 01:36:18 +05:30
Prashant Singh
6d40b54d1d
Remote sync
2019-06-27 01:36:11 +05:30
Prashant Singh
c783ffa966
Added more checks for noncouponable and couponable rule interfaces
2019-06-27 01:32:32 +05:30
Prashant Singh
73d9966a12
Fixed issue #1108
2019-06-26 16:42:53 +05:30
rahul shukla
9a92a61724
try & catch added in buynow
2019-06-26 16:40:15 +05:30
Jitendra Singh
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
Prashant Singh
ecd766cb81
Some changes in frontend regarding coupon form on checkout
2019-06-25 14:57:26 +05:30
rahul shukla
b0efd192e2
removed undefined variable rule from checkout/save payment
2019-06-24 18:03:31 +05:30
rahul shukla
7d2b751479
issue #1015 pagination responsive
2019-06-21 16:17:37 +05:30
rahul shukla
a35c997a56
issue #1014
2019-06-21 15:01:51 +05:30
rahul shukla
ba26a39f74
issue #951
2019-06-21 14:41:22 +05:30
rahul shukla
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
rahul shukla
d76d8bd129
flash message for discount & error
2019-06-19 21:18:16 +05:30
rahul shukla
144bda6590
review page render in onepage
2019-06-19 17:08:36 +05:30
Prashant Singh
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
jitendra
aa1a5451bd
Fixed checkout summary refresh issue
2019-06-19 15:15:27 +05:30
Prashant Singh
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
Jitendra Singh
210be70779
Merge pull request #1049 from prashant-webkul/development
...
all calculations now changed to base price
2019-06-18 19:02:39 +05:30
rahul shukla
3af3996439
buy now issue
2019-06-18 17:42:11 +05:30
Prashant Singh
82d916c646
cart rule action percent of product changed to base price of item
2019-06-17 16:20:53 +05:30
Prashant Singh
4b99f5acf9
Summary template now re rendering on applying and removal of coupon
2019-06-17 14:16:51 +05:30
Prashant Singh
c2c0836b85
Couponable rule getting over ride by previously applied non-couponable rule
2019-06-17 13:09:21 +05:30
Prashant Singh
d18667351c
Base sync
2019-06-17 12:38:29 +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
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
Prashant Singh
15abe379e0
Changed frontend attributes and syntax fixes in checkout
2019-06-16 17:26:06 +05:30
jitendra
b93bc11c65
Fixed js error in checkout page
2019-06-15 22:28:21 +05:30
jitendra
27b4ee19e5
Checkout coupon apply issue fixed
2019-06-15 22:22:40 +05:30
Prashant Singh
9ae4f8a801
Fixed issues with cart rule customer groups
2019-06-15 18:47:53 +05:30
Jitendra Singh
1f5d8a8f28
Revert "Revert "Development""
2019-06-15 16:50:37 +05:30
Jitendra Singh
545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:02 +05:30
Jitendra Singh
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
Jitendra Singh
ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development
...
Revert "buy now issue"
2019-06-15 15:13:16 +05:30
Jitendra Singh
fb5687c451
Revert "buy now issue"
2019-06-15 15:10:10 +05:30
Jitendra Singh
668f92185b
Revert "Development"
2019-06-15 15:10:04 +05:30
Jitendra Singh
7ac715e93d
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:09:59 +05:30
Prashant Singh
0927786cee
Fixed issue with order summary rendering on cart page
2019-06-15 14:56:24 +05:30
Prashant Singh
eaa755bbea
Fixed discount on frontend
2019-06-15 13:13:07 +05:30
Prashant Singh
fc43b158dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-15 10:49:04 +05:30
Prashant Singh
3a8b923f5c
Discount rule
2019-06-14 23:48:08 +05:30
rahul shukla
076f197de7
buy now issue
2019-06-14 21:04:22 +05:30
Prashant Singh
c36950c609
applied translation string in apply coupon responses
2019-06-14 20:26:54 +05:30
Prashant Singh
0188644fce
Prepared standard responses when applying couponable rules
2019-06-14 20:04:32 +05:30
Prashant Singh
bb097be557
Added error message provision in the same when coupon application fails
2019-06-14 19:58:25 +05:30
Prashant Singh
bec9ebe7fb
coupon section fix in review-order component
2019-06-14 19:52:58 +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
jitendra
3f814d9253
Fixed checkout issue
2019-06-14 15:13:20 +05:30
Jitendra Singh
8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
...
Fixed checkout issue
2019-06-14 15:00:15 +05:30
jitendra
5b81968bae
Fixed checkout issue
2019-06-14 14:59:29 +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
rahul shukla
5afef79ac2
merge with master
2019-06-13 20:24:52 +05:30
jitendra
6e8c0da054
Fixed conflicts
2019-06-13 19:48:30 +05:30
jitendra
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +05:30
Prashant Singh
abf46c8a99
Added discount amount in cart item table
2019-06-13 19:30:00 +05:30
Prashant Singh
a27bae1c2d
All assets compiled for production
2019-06-13 19:08:42 +05:30
rahul shukla
0fc78c5d83
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
2019-06-13 14:51:24 +05:30
Prashant Singh
23467d9389
Added message when seller is blocked
2019-06-13 06:37:16 +05:30
Prashant Singh
4542c96b17
Fixed issue in core regarding buynow button passing static quantity as 1 is now removed
2019-06-12 15:16:06 +05:30
rahul shukla
6a8c7a8784
assests compile for production
2019-06-11 16:40: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
5585b503cf
Car controller updated
2019-06-07 16:36:50 +05:30
jitendra
ca4d9ef9ba
Fixed js issue buy now button not exist
2019-06-07 15:42:58 +05:30
rahul shukla
af67516c36
object added with event
2019-06-06 15:16:16 +05:30
rahul shukla
255664c4c0
back button implemented on checkout page
2019-06-04 16:36:42 +05:30
rahul shukla
fc456c785f
issue #850
2019-06-03 16:29:00 +05:30
jitendra
96e8556b54
Fixed mini cart layout
2019-05-31 18:30:09 +05:30
jitendra
8202f58284
Issue #932 fixed
2019-05-31 17:52:52 +05:30