Commit Graph

1001 Commits

Author SHA1 Message Date
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
rahul shukla 48d86f05e8 Issue #1260 & mail logo 2019-09-13 15:04:29 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
prateek srivastava 98792912d8 translation added 2019-09-13 12:50:06 +05:30
prateek srivastava 9794fc659e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-13 12:45:07 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 5fd72de3a9 Issue #1249 2019-09-12 18:31:40 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
Jitendra Singh 9a443b6f3b
Merge pull request #1446 from prashant-webkul/development
Command line installer fix
2019-09-12 15:52:58 +05:30
Prashant Singh 2c928ea25c Fixed issue #1288 2019-09-12 15:23:29 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
Jitendra Singh e604037adf
Merge pull request #1445 from prashant-webkul/development
Fixed issue #1288 #1434 #1444
2019-09-12 11:14:27 +05:30
Prashant Singh 6c82802371 Fixed issues #1444 & #1434 2019-09-11 20:10:59 +05:30
rahul shukla d9a0c6078e order number 2019-09-11 17:47:52 +05:30
rahul shukla aab8bd1479 order number 2019-09-11 17:34:11 +05:30
Jitendra Singh ac48a20822
Merge pull request #1343 from lemmeV/master
added configurable order numbers
2019-09-11 15:51:30 +05:30
jitendra 484fb56e54 Price added to downloadable product links 2019-09-11 13:46:33 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Jitendra Singh b3ca0200ac
Merge pull request #1387 from codeinnovers/master
fixed issue  #1371
2019-09-11 13:13:13 +05:30
jitendra 128dde536e Fixed issues of bundle, downloadable products 2019-09-10 19:22:11 +05:30
jitendra b5163fe9b3 Fixed Not getting sample link for file if url is selected 2019-09-10 15:06:34 +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 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
jitendra 10b706c1d7 Merged with master 2019-09-09 14:46:43 +05:30
Jitendra Singh 9d5032d619
Merge pull request #1424 from rahulshukla-webkul/development
Development
2019-09-09 13:18:18 +05:30
rahul shukla 98df7f25f7 Issue #1256 2019-09-09 12:57:28 +05:30
Prashant Singh 64f5bef341 Category filters : price filter was always active, turned active value to false 2019-09-08 01:37:04 +05:30
rahul shukla 8ce93244de Issue #1263 2019-09-07 15:08:26 +05:30
rahul shukla 9e8edfa226 changed in webpack 2019-09-07 13:27:54 +05:30
jitendra 8545d5ef3c Unlimited download link issue fixed 2019-09-06 19:46:25 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
jitendra 7b73abac95 Order view blade updated 2019-09-06 11:43:14 +05:30
rahul shukla 7d9c785f7d issue #1226 2019-09-05 18:06:51 +05:30
jitendra 7952e57e41 Cart page css updated 2019-09-05 17:39:10 +05:30
jitendra 75e294e1c5 Cart page quantity changer updated 2019-09-05 17:31:09 +05:30
jitendra 55fa22af6c Virtual product add to cart issue fixed 2019-09-05 15:36:28 +05:30
jitendra 38f73505af Assets compiled for production 2019-09-05 15:14:45 +05:30
jitendra 94290e6742 Option mission message added for configurable, group and bundle products during add cart 2019-09-04 17:33:55 +05:30
jitendra 55f888c1df Shop tranlation case fixed 2019-09-04 17:23:53 +05:30
jitendra 136c03ee3a Layered navigation price filter changed based on min_price and max_price 2019-09-04 16:52:38 +05:30
jitendra 3c5a2792e3 Removed configurable checks and deleted unwanted files 2019-09-04 16:23:05 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Sam 8c75c20e1d fixed issue #1371 2019-09-03 23:22:51 +05:30
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
Karim Qaderi c088ee1f45
change route pages to page 2019-08-29 18:43:53 +04:30
Karim Qaderi 46a40cc421
add event page checkout/success 2019-08-25 21:36:06 +04:30
Lemme Velleõu 4f8f470095 added configurable order numbers 2019-08-22 18:24:30 +03:00
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