diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index ec55be765..cf19fcff5 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -2,6 +2,319 @@ #### This changelog consists the bug & security fixes and new features being included in the releases listed below. +## **v1.1.3 (19th of June 2020)** - *Release* + +* [feature] - Customer group price for products implemented + +* [feature] - Image search feature added with tensorflow.js + +* [feature] - Migrated to Laravel 7 + +* [feature] - Search engine optimization with rich snippet + + +* #343 [fixed] - Translation strings are missing from awful amount of controllers when returning responses with flash. And optimise translation strings for faster static translations. + +* #824 [fixed] - Framework is not supporting I.E 11 browser. + +* #838 [fixed] - Packages as composer dependency + +* #985 [fixed] - Dynamically insert products + +* #1258 [fixed] - If payment is done through paypal then invoice should generate automatically and status of Order should be processing. + +* #1362 [fixed] - Site logo and Category Image are broken + +* #1370 [fixed] - install fails at the last step + +* #1522 [fixed] - Quick Links broken + +* #1656 [fixed] - Validation error in Phone Field while Adding Address + +* #1981 [fixed] - If customer update his address at time of checkout and save this address then address doesn't get save and also on checkout page old address displays. + +* #2009 [fixed] - Using AWS S3 for storage + +* #2060 [fixed] - auto generate coupon accordion not getting hidden while selecting no specific coupons + +* #2159 [fixed] - Taking more time to load product details in shopping cart. + +* #2415 [fixed] - Add TO CART button should replace by “BOOk NOW” button for booking product. + +* #2590 [fixed] - hi everyone i'm wondering if customers after register could give a referral code ?? + +* #2702 [fixed] - Getting broken image for products and category. + +* #2720 [fixed] - Error during migration on php artisan migrate + +* #2725 [fixed] - Variants should not be created if cofigurable product created failed + +* #2762 [fixed] - Seeder: SQL Error: Duplicate entry for '1' key 'PRIMARY' + +* #2766 [fixed] - Needs User friendly UI for the event booking in product page + +* #2789 [fixed] - Product channel and locale dropdowns in the admin dashboard not working + +* #2795 [fixed] - Cart error merging if you authenticate having items with low stock + +* #2800 [fixed] - Add the ability to change Attribute Family for Products + +* #2804 [fixed] - There should be order review section instead of complete section on checkout page + +* #2805 [fixed] - the sku should be all in caps + +* #2844 [fixed] - showing product image of each color in configurable product + +* #2863 [fixed] - Search Product Name and Description + +* #2868 [fixed] - Cart (customer) address not persisted during the checkout + +* #2874 [fixed] - Order, payment process and payment metadata + +* #2888 [fixed] - Always Default locale should be selected when add new product for each channels + +* #2889 [fixed] - timezone drop down field is not visible in web installer + +* #2893 [fixed] - When creating a shipment, display items invoiced + +* #2931 [fixed] - Customer pays order in PayPal but there is no record in bagisto + +* #2936 [fixed] - change the admin route for another + +* #2942 [fixed] - Randomize New and Featured Products + +* #2949 [fixed] - failed to migrate with new database using installer + +* #2950 [fixed] - multiple error message on installer + +* #2964 [fixed] - Exception when buying non stockable item via API + +* #2969 [fixed] - Cancel icon is not visible in velocity theme for customer order detail + +* #2972 [fixed] - can add to homescreen on mobile device in velocity theme + +* #2974 [fixed] - Thumbnails are not generating on mobile ifproduct has more than 4 photos + +* #2886 [fixed] - Configuration option for Compare + +* #2985 [fixed] - Product category is not saving + +* #2987 [fixed] - mult address + +* #2990 [fixed] - Facebook Pixel integration for Laravel + +* #2991 [fixed] - Filters not showing in small devices + +* #2994 [fixed] - Shipping method not getting updated after changing the zip code. + +* #2995 [fixed] - filter is not showing when search product from search bar + +* #2996 [fixed] - Incomplete products JSON when type is grouped or bundled + +* #2997 [fixed] - Category show sidebar + +* #3000 [fixed] - arabic product in home page Not lined up in one format + +* #3001 [fixed] - Getting Error Exception when view order details + +* #3004 [fixed] - Category Deactivation not working + +* #3005 [fixed] - One page checkout creating new address in profile every time. + +* #3009 [fixed] - Featured product slider and new product slider is not working + +* #3011 [fixed] - The product is in cart or not + +* #3014 [fixed] - Support for Responsive Admin Panel + +* #3018 [fixed] - Icons are not showing on imac + +* #3020 [fixed] - Images can not add on velocity theme + +* #3021 [fixed] - Deactivating the last category of level1 renders only level2 etc. from deactivated category + +* #3022 [fixed] - storage/ should not be included in .gitignore + +* #3024 [fixed] - Blank order comment shouldn't added + +* #3025 [fixed] - save address return error 500 + +* #3026 [fixed] - Date validation error when editing Booking Products + +* #3029 [fixed] - velocity theme not fully responsive + +* #3032 [fixed] - [Critical] Onecheckout preventing to continue to shipping method after selecting address + +* #3035 [fixed] - Please update pwa for bagisto + +* #3036 [fixed] - Shipping address options not shown + +* #3037 [fixed] - error mysql 8.0.20 bagisto v 1.1.2 + +* #3038 [fixed] - Trying to get property 'code' of non-object + +* #3040 [fixed] - Api logout not working.. + +* #3044 [fixed] - Getting exception when click on view shopping cart if adding group product in cart that contains variants of configurable product. + +* #3047 [fixed] - The qty of configurable product is 0 when merging cart + +* #3048 [fixed] - "nwidart/laravel-modules": "^3.2", is the wrong version for laravel 6.* + +* #3050 [fixed] - Can't override models + +* #3051 [fixed] - error while migrate bagisto manually from console command + +* #3053 [fixed] - [Velocity] Checkout: Shipping/Billing Address Name, email does not get updated + +* #3054 [fixed] - customer is getting exception while cancel order + +* #3061 [fixed] - CORS errors + +* #3067 [fixed] - PHP Notice: date_default_timezone_set(): Timezone ID 'Asia/JakartaAsia/Kolkata' is invalid + +* #3068 [fixed] - Inactive inventory source are get select in channel and products + +* #3070 [fixed] - Edit Attribute -> Add Option or Swatch Item Error 404 for Indonesia(id) country code + +* #3073 [fixed] - HTML entities are not being decoded when editing attribute options + +* #3076 [fixed] - checkout disable when add new shipping address + +* #3077 [fixed] - How to change validation messages to spanish not working + +* #3079 [fixed] - Tracking Number in My Account + +* #3087 [fixed] - after installation, first product registration does not open detailed page, I only opened from the second product + +* #3089 [fixed] - not getting price after changing configurable options + +* #3090 [fixed] - error mysql8 + +* #3095 [fixed] - pending orders detail page is blank when viewing in arabic locale + +* #3096 [fixed] - error when add product in compare list from the search product page + +* #3097 [fixed] - getting console error when remove cart item + +* #3113 [fixed] - catalog storefront configuration for per product page is not working + +* #3115 [fixed] - minify the velocity.js for gtmetrix + +* #3118 [fixed] - Home page doesn't display categories and language bar doesn't work. + +* #3120 [fixed] - admin panel multi locale + +* #3135 [fixed] - How can I cad comment box in checkout form. + +* #3136 [fixed] - configurable product variant name gets removed from the catalog list + +* #3140 [fixed] - API for more than one locale ! + +* #3144 [fixed] - error if selecting only one currency + +* #3146 [fixed] - how to configure aws smtp server on bagisto + +* #3150 [fixed] - Attribute not showing on the creating new configurable product page + +* #3153 [fixed] - Free Shipping and Flat Rate Shipping not desable + +* #3158 [fixed] - Column not found: 1054 Unknown column 'symbol' in 'field l + +* #3160 [fixed] - Disabled products are not removed from bundles + +* #3161 [fixed] - Trying to access array offset on value of type null + +* #3164 [fixed] - getting exception when add/edit configurable product + +* #3171 [fixed] - fixed amount is applied on product for customer group price instead of apply in % + +* #3172 [fixed] - description or name is missing for comparable items if customer login + +* #3183 [fixed] - ErrorException + +* #3184 [fixed] - Site showing blank page on 404 + +* #3186 [fixed] - replace payment method text with an image on the checkout page + +* #3190 [fixed] - Bagisto v1.1.2 velocity responsive theme issue on iPhone and iPads + +* #3191 [fixed] - Bagisto v1.1.2 velocity responsive theme issue on iPhone and iPads + +* #3197 [fixed] - Call to undefined function str_limit() when view product in velocity theme + +* #3199 [fixed] - Getting exception when click on product. + +* #3202 [fixed] - Getting exception in creating grouped product. + +* #3203 [fixed] - Getting translation issue in price field of downloadable product. + +* #3204 [fixed] - Getting exception when changing currency from search page. + +* #3205 [fixed] - Able to create the product without selecting required toggles button. + +* #3208 [fixed] - Customer group price functionality is not working. + +* #3207 [fixed] - Issue in variant product of configurable, only one variant name display at a time and on refreshing it changes. + +* #3214 [fixed] - Getting exception on forgot password link. + +* #3215 [fixed] - when updating an attribute to 'use_in_flat', bagisto should update the product_flat table with the values of those products + +* #3218 [fixed] - virtual product not shipping step.. + +* #3219 [fixed] - fix the date/time format in booking products + +* #3222 [fixed] - UI issue in event ticket booking special price date field + +* #3232 [fixed] - homepage is showing 404 error page in both theme + +* #3234 [fixed] - UI Issue for cart, wishlist, compare icon number indicator in RTL + +* #3236 [fixed] - selected category gets removed from the search in RTL + +* #3235 [fixed] - need space b/w sign in & sign up box in mini login window for RTL + +* #3237 [fixed] - Options of attribute not display as per its position + +* #3238 [fixed] - Trait 'Illuminate\Foundation\Auth\SendsPasswordResetEmails' not found + +* #3240 [fixed] - Payment methods in onepage checkout are not visible completely in RTL + +* #3241 [fixed] - login fields(email,passwords) are in the center when in RTL + +* #3246 [fixed] - fix icon layout in edit booking product page for RTL + +* #3248 [fixed] - fix css for cancel icon on success alert RTL + +* #3249 [fixed] - icons are overlapped in comparison page for RTL + +* #3250 [fixed] - find product by image in search attempt to an error if app_url isn't define + +* #3254 [fixed] - exception on changing locale to Italian + +* #3255 [fixed] - Appointment booking slot duration missing in UI for RTL + +* #3265 [fixed] - recently view product heading is overlapped in RTL + +* #3270 [fixed] - fix icon design on catalog rule when select special price as condition + +* #3272 [fixed] - getting exception when booking product type is not same as cart item for same product id + +* #3273 [fixed] - fix calendar icon present at dashboard in RTL + +* #3274 [fixed] - Installer Blank Page After Migration + +* #3286 [fixed] - fix calendar icon css at admin dashboard + +* #3289 [fixed] - Main product is not showing in catalog grid if configurable product hasn't been created completely. + +* #3297 [fixed] - getting exception when save booking product from edit page + +* #3298 [fixed] - Header content category always redirect to 404 error page + + + ## **v1.1.2 (24th of March 2020)** - *Release* * [feature] - Now customer can cancel order. @@ -46,8 +359,6 @@ * #2901 [fixed] - Error when creating a category -* #2902 [fixed] - unify address tables - * #2908 [fixed] - A class is missing from the Velocity ProductRepositiry file * #2914 [fixed] - Filter not showing on mobile, also sorting not working on mobile @@ -205,6 +516,8 @@ + + ## **v1.1.0 (24th of March 2020)** - *Release* * [feature] Added new booking type product. diff --git a/config/debugbar.php b/config/debugbar.php index 3275f105a..d1fcc58b0 100755 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -111,7 +111,7 @@ return [ 'views' => true, // Views with their data 'route' => true, // Current route information 'auth' => false, // Display Laravel authentication status - 'gate' => true, // Display Laravel Gate checks + 'gate' => true, // Display Laravel Gate checks 'session' => true, // Display session data 'symfony_request' => true, // Only one can be enabled.. 'mail' => true, // Catch mail messages @@ -122,7 +122,7 @@ return [ 'files' => false, // Show the included files 'config' => false, // Display config settings 'cache' => false, // Display cache events - 'models' => false, // Display models + 'models' => true, // Display models ], /* diff --git a/config/excel.php b/config/excel.php index 213afe571..fa3e12b28 100755 --- a/config/excel.php +++ b/config/excel.php @@ -179,7 +179,8 @@ return [ | in conjunction with queued imports and exports. | */ - 'remote_disk' => null, + 'remote_disk' => null, + 'remote_prefix' => null, ], ]; diff --git a/config/tinker.php b/config/tinker.php index 0d2bf00e7..0fdd538d6 100755 --- a/config/tinker.php +++ b/config/tinker.php @@ -17,6 +17,21 @@ return [ // App\Console\Commands\ExampleCommand::class, ], + /* + |-------------------------------------------------------------------------- + | Alias Whitelist + |-------------------------------------------------------------------------- + | + | Tinker will not automatically alias classes in your vendor namespaces + | but you may explicitly allow a subset of classes to get aliased by + | adding the names of each of those classes to the following list. + | + */ + + 'alias' => [ + // + ], + /* |-------------------------------------------------------------------------- | Alias Blacklist diff --git a/packages/Webkul/API/Http/Controllers/Shop/ForgotPasswordController.php b/packages/Webkul/API/Http/Controllers/Shop/ForgotPasswordController.php index c485e2b70..e12e0c885 100644 --- a/packages/Webkul/API/Http/Controllers/Shop/ForgotPasswordController.php +++ b/packages/Webkul/API/Http/Controllers/Shop/ForgotPasswordController.php @@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Password; class ForgotPasswordController extends Controller { use SendsPasswordResetEmails; - + /** * Store a newly created resource in storage. * diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css index 8cb325b48..5320192c4 100755 --- a/packages/Webkul/Admin/publishable/assets/css/admin.css +++ b/packages/Webkul/Admin/publishable/assets/css/admin.css @@ -1 +1 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);body{margin:0;color:#3a3a3a;font-family:Montserrat,sans-serif;font-size:14px;font-weight:500;position:static;height:100%;width:100%;background-color:#fff}::-webkit-scrollbar{width:12px}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px hsla(0,0%,100%,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.5)}.navbar-top{height:60px;background-color:#fff;font-size:0;box-shadow:0 3px 6px 0 rgba(0,0,0,.05);border-bottom:1px solid hsla(0,0%,63.5%,.2);position:fixed;left:0;right:0;z-index:5}.navbar-top .navbar-top-left{width:50%;height:60px;display:inline-block;vertical-align:middle;background-color:#fff}.navbar-top .navbar-top-left .brand-logo{padding:10px}.navbar-top .navbar-top-right{width:50%;height:60px;text-align:right;display:inline-block;vertical-align:middle}.navbar-top .navbar-top-right .profile-info{display:inline-block;vertical-align:middle;text-align:left;min-width:50px;padding:12px 0;margin:0 25px 0 30px;font-size:15px;cursor:pointer;position:relative}.navbar-top .navbar-top-right .profile-info .app-version{padding:10px 20px 0;margin-bottom:-10px;display:block;cursor:default;color:#a2a2a2}.navbar-top .navbar-top-right .profile-info .dropdown-list{top:63px;right:0!important;bottom:inherit!important}.navbar-top .navbar-top-right .profile-info .name{color:#000311;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info .role{font-size:14px;color:#8e8e8e;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info i.icon{margin-left:10px}.navbar-left{position:fixed;left:0;top:60px;width:90px;padding-top:20px;border-right:1px solid hsla(0,0%,63.5%,.2);height:auto;bottom:0;z-index:2;background-color:#fff}.navbar-left ul.menubar li.menu-item{padding:10px 5px;font-size:11px;text-align:center;text-transform:uppercase}.navbar-left ul.menubar li.menu-item a{color:#a2a2a2}.navbar-left ul.menubar li.menu-item.active a{color:#0041ff}.navbar-left ul.menubar li.menu-item span{display:block;margin:auto}.content-container{padding-left:90px;position:absolute;margin-top:60px;top:0;right:0;left:0;bottom:0;height:calc(100% - 60px);width:100%}.content-container .inner-section{height:100%}.content-container .aside-nav{width:280px;position:fixed;top:60px;bottom:0;border-right:1px solid hsla(0,0%,63.5%,.2);background-color:#f8f9fa;padding-top:10px;padding-bottom:10px;z-index:4}.content-container .aside-nav ul{overflow-y:auto;height:90%}.content-container .aside-nav a{padding:15px;display:block;color:#000311}.content-container .aside-nav .active a{background:#fff;border-top:1px solid hsla(0,0%,63.5%,.2);border-bottom:1px solid hsla(0,0%,63.5%,.2)}.content-container .aside-nav .active i{float:right}.content-container .content-wrapper{padding:25px 25px 25px 15px;margin-left:280px;margin-top:1px;background-color:#fff}.content-container .content{margin-top:25px}.content-container .content.full-page{padding:25px}.content-container .content .page-header{display:inline-block;width:100%;padding:15px 10px 15px 0;position:-webkit-sticky;position:sticky;top:50px;z-index:3;background-color:#fff}.content-container .content .page-header .page-title{float:left}.content-container .content .page-header .page-title .back-link{float:left;margin-right:10px;width:24px;height:24px;cursor:pointer;margin-top:5px}.content-container .content .page-header .page-title h1{margin-bottom:0;vertical-align:middle;display:inline-block;line-height:normal}.content-container .content .page-header .page-action{float:right}.content-container .content .page-header .page-action *{display:inline-block}.content-container .content .page-header .page-action a{margin-left:25px}.content-container .content .page-header .control-group{width:180px;display:inline-block;margin-bottom:0;margin-left:20px}.content-container .content .page-header .control{width:100%;margin:0}.content-container .content .page-content{width:100%;display:inline-block}.control-container{display:flex;flex-direction:row;align-items:flex-start;width:750px}.control-container .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:150px;height:36px;display:inline-block;vertical-align:middle;transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px}.control-container .control:focus{border-color:#0041ff}.control-container .icon:hover{cursor:pointer}.control-container .control-group::last-child{margin-right:0}.boolean-control-container{display:flex;flex-direction:row;justify-content:flex-start;width:750px}.boolean-control-container .control-group{width:200px}.control-group label{width:70%}.control-group label .locale{float:right;color:#8e8e8e}.control-group .mce-tinymce{margin-top:10px;margin-bottom:5px}.dashboard .page-header{margin-bottom:0!important;padding-bottom:15px;border-bottom:1px solid hsla(0,0%,63.5%,.2)}.dashboard .page-header .control-group span{width:100%}.dashboard .page-header .control-group.date:after{margin-top:-13px;left:100%}.dashboard .page-content{margin-top:15px}.dashboard .card{height:445px;background-color:#fff;border:1px solid hsla(0,0%,63.5%,.2);box-shadow:0 5px 10px 2px hsla(0,0%,63.5%,.2);border-radius:.25rem;padding:20px 0 0 20px;overflow:auto}.dashboard .card .card-title{font-size:14px;color:#a2a2a2;letter-spacing:-.26px;text-transform:uppercase}.dashboard .card .card-info{width:100%;display:inline-block}.dashboard .card .card-info.center{text-align:center}.dashboard .card .card-info ul li{border-bottom:1px solid hsla(0,0%,63.5%,.2);width:100%;display:inline-block;padding:10px 0;position:relative}.dashboard .card .card-info ul li .image{height:60px;width:60px;float:left;margin-right:15px}.dashboard .card .card-info ul li .image.product{background:#f2f2f2}.dashboard .card .card-info ul li .image img{width:100%}.dashboard .card .card-info ul li .description{margin-top:10px}.dashboard .card .card-info ul li .description .name{color:#0041ff}.dashboard .card .card-info ul li .description .info{color:#3a3a3a;margin-top:5px}.dashboard .card .card-info ul li .icon.angle-right-icon{position:absolute;right:30px;top:50%;margin-top:-8px}.dashboard .card .card-info ul li:last-child{border-bottom:0}.dashboard .card .card-info .no-result-found{margin-top:146px}.dashboard .card .card-info .no-result-found p{margin:0;color:#a2a2a2}.dashboard .dashboard-stats{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.dashboard .dashboard-stats .dashboard-card{height:100px;background:#fff;border:1px solid hsla(0,0%,63.5%,.2);box-shadow:0 5px 10px 2px hsla(0,0%,63.5%,.2);border-radius:5px;position:relative;padding:15px}.dashboard .dashboard-stats .dashboard-card .title{font-size:14px;color:#a2a2a2;text-transform:uppercase}.dashboard .dashboard-stats .dashboard-card .data{padding-top:13px;font-size:32px;color:#0041ff}.dashboard .dashboard-stats .dashboard-card .data .progress{font-size:14px;color:#8e8e8e;float:right;margin-top:-2px}.dashboard .dashboard-stats .dashboard-card .data .progress .icon{vertical-align:middle}.dashboard .graph-stats{margin-top:30px;width:100%;display:inline-block}.dashboard .graph-stats .left-card-container{float:left;width:75%;padding-right:9px}.dashboard .graph-stats .right-card-container{float:left;width:25%;padding-left:21px}.dashboard .sale-stock{width:100%;display:inline-block;display:grid;grid-template-columns:repeat(auto-fill,minmax(435px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px;margin-top:30px}.configuration-image{position:relative;height:33px;width:33px;top:15px;border-radius:3px;margin-right:5px}.download{position:relative;height:24px!important;width:24px!important;top:12px;margin-right:10px}.aside-nav-toggle{height:48px;width:100%;padding-top:15px;border-top:1px solid hsla(0,0%,63.5%,.2)}.aside-nav-toggle .close-icon,.aside-nav-toggle .open-icon{position:absolute;cursor:pointer;left:45%}.aside-nav-toggle.open{display:none}.linked-product-search-result{box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);z-index:10;text-align:left;border-radius:3px;background-color:#fff;width:70%;max-height:200px;overflow-y:auto}.linked-product-search-result li{padding:10px;border-bottom:1px solid #e8e8e8;cursor:pointer}.cart-rule-conditions table td.attribute,.catalog-rule-conditions table td.attribute{width:250px;padding-left:0}.cart-rule-conditions table td.operator,.cart-rule-conditions table td.value,.catalog-rule-conditions table td.operator,.catalog-rule-conditions table td.value{width:260px}.cart-rule-conditions table td.actions,.catalog-rule-conditions table td.actions{width:44px}.cart-rule-conditions table td.actions .icon,.catalog-rule-conditions table td.actions .icon{margin-top:6px}.sale-container .sale-section{font-size:16px}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid hsla(0,0%,63.5%,.2)}.sale-container .sale-section .section-content{display:block;padding:20px 0}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .table .qty-row{display:block;margin-bottom:5px}.sale-container .table .qty-row:last-child{margin-bottom:0}.sale-container .table .radio{margin:0}.sale-container .summary-comment-container .comment-container{margin-top:20px;float:left}.sale-container .summary-comment-container .comment-container .comment-list{margin-top:40px}.sale-container .summary-comment-container .comment-container .comment-list li{margin-bottom:20px}.sale-container .summary-comment-container .comment-container .comment-list li:last-child{margin-bottom:0}.sale-container .summary-comment-container .comment-container .comment-list li p{margin:5px 0 0;color:#8e8e8e}.sale-container .sale-summary{margin-top:20px;height:130px;float:right}.sale-container .sale-summary tr td{padding:5px 8px;vertical-align:text-bottom}.sale-container .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .sale-summary tr.border td{border-bottom:1px solid hsla(0,0%,63.5%,.2)}.stars{margin-top:5px}.stars .icon{width:16px;height:16px}.export-import{cursor:pointer}.export-import .export-icon,.export-import .import-icon{position:relative;top:10px}.export-import span{margin-left:2px}.rtl{direction:rtl}.rtl .form-container{text-align:right!important}.rtl .navbar-top .navbar-top-right{text-align:left}.rtl .navbar-top .navbar-top-right .profile-info{margin:0 30px 0 25px}.rtl .navbar-top .navbar-top-right .profile-info i.icon{margin-left:0;margin-right:10px}.rtl .navbar-left{border-left:1px solid hsla(0,0%,63.5%,.2);border-right:none;left:calc(100% - 90px);background-color:#fff}.rtl .content-container{padding-right:90px;padding-left:0}.rtl .content-container .content .page-header .page-title{float:right}.rtl .content-container .content .page-header .page-action{float:left}.rtl .content-container .content .page-header .page-action a{margin-left:0}.rtl .content-container .content .page-header .control-group{margin-right:20px;margin-left:0}.rtl .content-container .content .page-header .control-group.has-error.date:after{margin-top:-12px}.rtl .content-container .content .page-header .control-group.date:after{margin-top:6px;position:absolute;margin-right:-35px}.rtl .content-container .content .page-header .control-group.date:last-child{margin-left:0}.rtl .content-container .content-wrapper{padding:25px 305px 25px 25px;margin-left:0}.rtl .content-container .aside-nav .active i{float:left;transform:rotate(180deg)}.rtl .dashboard .dashboard-stats .dashboard-card .data span{float:left}.rtl .dashboard .card{padding:20px 20px 0 0}.rtl .dashboard .card .card-info ul li .image{float:right;margin-right:0;margin-left:15px}.rtl .dashboard .card .card-info ul li .icon.angle-right-icon{left:30px;right:auto;transform:rotate(180deg)}.rtl .dashboard .graph-stats .left-card-container{float:right;padding-right:0}.rtl .dashboard .graph-stats .right-card-container{float:right;padding-left:0;padding-right:30px}.rtl .sale-container .sale-summary{float:left}.rtl .grid-container .filter-row-one .search-filter{border:2px solid #c7c7c7;border-radius:2px}.rtl .grid-container .filter-row-one .search-filter .control{border:none;padding-right:10px}.rtl .grid-container .filter-row-one .search-filter .icon-wrapper{padding-top:2px;padding-right:5px;border:none;border-right:2px solid #c7c7c7;border-radius:0}.rtl .grid-container .filter-row-two .filter-tag .icon.cross-icon,.rtl .grid-container .filter-row-two .filter-tag .wrapper{margin-right:10px;margin-left:0}.rtl .grid-container .filter-row-one .dropdown-filters{right:unset;position:static!important;left:25px}.rtl .grid-container .filter-row-one .dropdown-filters .per-page-label{position:static!important}.rtl .grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header span{padding-right:5px}.rtl .grid-container .table tbody td.action a:first-child{margin-left:10px;margin-right:0}.rtl .table table{text-align:right}.rtl .table table .massaction-remove{margin-right:5px!important;margin-left:10px}.rtl .table table .btn.btn-primary{margin-right:10px!important}.rtl .dropdown-list.bottom-right{left:0;right:auto}.rtl .dropdown-list .dropdown-container{text-align:right}.rtl .accordian .accordian-header .icon{float:left}.rtl .tree-container .tree-item{padding-right:30px}.rtl .tree-container .tree-item .expand-icon,.rtl .tree-container .tree-item .folder-icon{margin-left:10px;margin-right:0}.rtl .tree-container>.tree-item{padding-right:0}.rtl .radio .radio-view{margin-left:5px}.rtl .image-wrapper .image-item{margin-right:0;margin-left:20px}.rtl .image-wrapper .image-item .remove-image{margin-right:0}.rtl .control-group label.required:before{content:"*";color:#fc6868;font-weight:700}.rtl .control-group label.required:after{content:none}.rtl .control-group label .locale{float:left}.rtl .control-group.date:after{margin-right:-34px;right:70%}.rtl .pagination .page-item .icon{transform:rotate(180deg)}.accordian-header{background-color:#fbfbfb}.btn.btn-primary{background:#0041ff}.fixed-action{top:108px}.fixed-action,.fixed-action-slight{position:fixed;right:32px;z-index:20}.fixed-action-slight{top:94px}.pagination{margin-top:30px} \ No newline at end of file +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);body{margin:0;color:#3a3a3a;font-family:Montserrat,sans-serif;font-size:14px;font-weight:500;position:static;height:100%;width:100%;background-color:#fff}::-webkit-scrollbar{width:12px}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px hsla(0,0%,100%,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.5)}.navbar-top{height:60px;background-color:#fff;font-size:0;box-shadow:0 3px 6px 0 rgba(0,0,0,.05);border-bottom:1px solid hsla(0,0%,63.5%,.2);position:fixed;left:0;right:0;z-index:5}.navbar-top .navbar-top-left{width:50%;height:60px;display:inline-block;vertical-align:middle;background-color:#fff}.navbar-top .navbar-top-left .brand-logo{padding:10px}.navbar-top .navbar-top-right{width:50%;height:60px;text-align:right;display:inline-block;vertical-align:middle}.navbar-top .navbar-top-right .profile-info{display:inline-block;vertical-align:middle;text-align:left;min-width:50px;padding:12px 0;margin:0 25px 0 30px;font-size:15px;cursor:pointer;position:relative}.navbar-top .navbar-top-right .profile-info .app-version{padding:10px 20px 0;margin-bottom:-10px;display:block;cursor:default;color:#a2a2a2}.navbar-top .navbar-top-right .profile-info .dropdown-list{top:63px;right:0!important;bottom:inherit!important}.navbar-top .navbar-top-right .profile-info .name{color:#000311;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info .role{font-size:14px;color:#8e8e8e;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info i.icon{margin-left:10px}.navbar-left{position:fixed;left:0;top:60px;width:90px;padding-top:20px;border-right:1px solid hsla(0,0%,63.5%,.2);height:auto;bottom:0;z-index:2;background-color:#fff}.navbar-left ul.menubar li.menu-item{padding:10px 5px;font-size:11px;text-align:center;text-transform:uppercase}.navbar-left ul.menubar li.menu-item a{color:#a2a2a2}.navbar-left ul.menubar li.menu-item.active a{color:#0041ff}.navbar-left ul.menubar li.menu-item span{display:block;margin:auto}.content-container{padding-left:90px;position:absolute;margin-top:60px;top:0;right:0;left:0;bottom:0;height:calc(100% - 60px);width:100%}.content-container .inner-section{height:100%}.content-container .aside-nav{width:280px;position:fixed;top:60px;bottom:0;border-right:1px solid hsla(0,0%,63.5%,.2);background-color:#f8f9fa;padding-top:10px;padding-bottom:10px;z-index:4}.content-container .aside-nav ul{overflow-y:auto;height:90%}.content-container .aside-nav a{padding:15px;display:block;color:#000311}.content-container .aside-nav .active a{background:#fff;border-top:1px solid hsla(0,0%,63.5%,.2);border-bottom:1px solid hsla(0,0%,63.5%,.2)}.content-container .aside-nav .active i{float:right}.content-container .content-wrapper{padding:25px 25px 25px 15px;margin-left:280px;margin-top:1px;background-color:#fff}.content-container .content{margin-top:25px}.content-container .content.full-page{padding:25px}.content-container .content .page-header{display:inline-block;width:100%;padding:15px 10px 15px 0;position:-webkit-sticky;position:sticky;top:50px;z-index:3;background-color:#fff}.content-container .content .page-header .page-title{float:left}.content-container .content .page-header .page-title .back-link{float:left;margin-right:10px;width:24px;height:24px;cursor:pointer;margin-top:5px}.content-container .content .page-header .page-title h1{margin-bottom:0;vertical-align:middle;display:inline-block;line-height:normal}.content-container .content .page-header .page-action{float:right}.content-container .content .page-header .page-action *{display:inline-block}.content-container .content .page-header .page-action a{margin-left:25px}.content-container .content .page-header .control-group{width:180px;display:inline-block;margin-bottom:0;margin-left:20px}.content-container .content .page-header .control{width:100%;margin:0}.content-container .content .page-content{width:100%;display:inline-block}.control-container{display:flex;flex-direction:row;align-items:flex-start;width:750px}.control-container .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:150px;height:36px;display:inline-block;vertical-align:middle;transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px}.control-container .control:focus{border-color:#0041ff}.control-container .icon:hover{cursor:pointer}.control-container .control-group::last-child{margin-right:0}.boolean-control-container{display:flex;flex-direction:row;justify-content:flex-start;width:750px}.boolean-control-container .control-group{width:200px}.control-group label{width:70%}.control-group label .locale{float:right;color:#8e8e8e}.control-group .mce-tinymce{margin-top:10px;margin-bottom:5px}.ticket-list .control-group.date:after{left:unset;right:10px;top:34px}.ticket-list .control-group.has-error.date:after{top:47px}.rtl .ticket-list .control-group.has-error.date:after{top:47px;right:100%!important}.dashboard .page-header{margin-bottom:0!important;padding-bottom:15px;border-bottom:1px solid hsla(0,0%,63.5%,.2)}.dashboard .page-header .control-group span{width:100%}.dashboard .page-header .control-group.date:after{margin-top:-13px;left:100%}.dashboard .page-content{margin-top:15px}.dashboard .card{height:445px;background-color:#fff;border:1px solid hsla(0,0%,63.5%,.2);box-shadow:0 5px 10px 2px hsla(0,0%,63.5%,.2);border-radius:.25rem;padding:20px 0 0 20px;overflow:auto}.dashboard .card .card-title{font-size:14px;color:#a2a2a2;letter-spacing:-.26px;text-transform:uppercase}.dashboard .card .card-info{width:100%;display:inline-block}.dashboard .card .card-info.center{text-align:center}.dashboard .card .card-info ul li{border-bottom:1px solid hsla(0,0%,63.5%,.2);width:100%;display:inline-block;padding:10px 0;position:relative}.dashboard .card .card-info ul li .image{height:60px;width:60px;float:left;margin-right:15px}.dashboard .card .card-info ul li .image.product{background:#f2f2f2}.dashboard .card .card-info ul li .image img{width:100%}.dashboard .card .card-info ul li .description{margin-top:10px}.dashboard .card .card-info ul li .description .name{color:#0041ff}.dashboard .card .card-info ul li .description .info{color:#3a3a3a;margin-top:5px}.dashboard .card .card-info ul li .icon.angle-right-icon{position:absolute;right:30px;top:50%;margin-top:-8px}.dashboard .card .card-info ul li:last-child{border-bottom:0}.dashboard .card .card-info .no-result-found{margin-top:146px}.dashboard .card .card-info .no-result-found p{margin:0;color:#a2a2a2}.dashboard .dashboard-stats{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.dashboard .dashboard-stats .dashboard-card{height:100px;background:#fff;border:1px solid hsla(0,0%,63.5%,.2);box-shadow:0 5px 10px 2px hsla(0,0%,63.5%,.2);border-radius:5px;position:relative;padding:15px}.dashboard .dashboard-stats .dashboard-card .title{font-size:14px;color:#a2a2a2;text-transform:uppercase}.dashboard .dashboard-stats .dashboard-card .data{padding-top:13px;font-size:32px;color:#0041ff}.dashboard .dashboard-stats .dashboard-card .data .progress{font-size:14px;color:#8e8e8e;float:right;margin-top:-2px}.dashboard .dashboard-stats .dashboard-card .data .progress .icon{vertical-align:middle}.dashboard .graph-stats{margin-top:30px;width:100%;display:inline-block}.dashboard .graph-stats .left-card-container{float:left;width:75%;padding-right:9px}.dashboard .graph-stats .right-card-container{float:left;width:25%;padding-left:21px}.dashboard .sale-stock{width:100%;display:inline-block;display:grid;grid-template-columns:repeat(auto-fill,minmax(435px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px;margin-top:30px}.rtl .dashboard .page-header .control-group.date:after{margin-top:-13px!important;right:100%}.configuration-image{position:relative;height:33px;width:33px;top:15px;border-radius:3px;margin-right:5px}.download{position:relative;height:24px!important;width:24px!important;top:12px;margin-right:10px}.aside-nav-toggle{height:48px;width:100%;padding-top:15px;border-top:1px solid hsla(0,0%,63.5%,.2)}.aside-nav-toggle .close-icon,.aside-nav-toggle .open-icon{position:absolute;cursor:pointer;left:45%}.aside-nav-toggle.open{display:none}.linked-product-search-result{box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);z-index:10;text-align:left;border-radius:3px;background-color:#fff;width:70%;max-height:200px;overflow-y:auto}.linked-product-search-result li{padding:10px;border-bottom:1px solid #e8e8e8;cursor:pointer}.cart-rule-conditions table td.attribute,.catalog-rule-conditions table td.attribute{width:250px;padding-left:0}.cart-rule-conditions table td.operator,.cart-rule-conditions table td.value,.catalog-rule-conditions table td.operator,.catalog-rule-conditions table td.value{width:260px}.cart-rule-conditions table td.actions,.catalog-rule-conditions table td.actions{width:44px}.cart-rule-conditions table td.actions .icon,.catalog-rule-conditions table td.actions .icon{margin-top:6px}.sale-container .sale-section{font-size:16px}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid hsla(0,0%,63.5%,.2)}.sale-container .sale-section .section-content{display:block;padding:20px 0}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .table .qty-row{display:block;margin-bottom:5px}.sale-container .table .qty-row:last-child{margin-bottom:0}.sale-container .table .radio{margin:0}.sale-container .summary-comment-container .comment-container{margin-top:20px;float:left}.sale-container .summary-comment-container .comment-container .comment-list{margin-top:40px}.sale-container .summary-comment-container .comment-container .comment-list li{margin-bottom:20px}.sale-container .summary-comment-container .comment-container .comment-list li:last-child{margin-bottom:0}.sale-container .summary-comment-container .comment-container .comment-list li p{margin:5px 0 0;color:#8e8e8e}.sale-container .sale-summary{margin-top:20px;height:130px;float:right}.sale-container .sale-summary tr td{padding:5px 8px;vertical-align:text-bottom}.sale-container .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .sale-summary tr.border td{border-bottom:1px solid hsla(0,0%,63.5%,.2)}.stars{margin-top:5px}.stars .icon{width:16px;height:16px}.export-import{cursor:pointer}.export-import .export-icon,.export-import .import-icon{position:relative;top:10px}.export-import span{margin-left:2px}.rtl{direction:rtl}.rtl .form-container{text-align:right!important}.rtl .navbar-top .navbar-top-right{text-align:left}.rtl .navbar-top .navbar-top-right .profile-info{margin:0 30px 0 25px}.rtl .navbar-top .navbar-top-right .profile-info i.icon{margin-left:0;margin-right:10px}.rtl .navbar-left{border-left:1px solid hsla(0,0%,63.5%,.2);border-right:none;left:calc(100% - 90px);background-color:#fff}.rtl .content-container{padding-right:90px;padding-left:0}.rtl .content-container .content .page-header .page-title{float:right}.rtl .content-container .content .page-header .page-action{float:left}.rtl .content-container .content .page-header .page-action a{margin-left:0}.rtl .content-container .content .page-header .control-group{margin-right:20px;margin-left:0}.rtl .content-container .content-wrapper{padding:25px 305px 25px 25px;margin-left:0}.rtl .content-container .aside-nav .active i{float:left;transform:rotate(180deg)}.rtl .dashboard .dashboard-stats .dashboard-card .data span{float:left}.rtl .dashboard .card{padding:20px 20px 0 0}.rtl .dashboard .card .card-info ul li .image{float:right;margin-right:0;margin-left:15px}.rtl .dashboard .card .card-info ul li .icon.angle-right-icon{left:30px;right:auto;transform:rotate(180deg)}.rtl .dashboard .graph-stats .left-card-container{float:right;padding-right:0}.rtl .dashboard .graph-stats .right-card-container{float:right;padding-left:0;padding-right:30px}.rtl .sale-container .sale-summary{float:left}.rtl .grid-container .filter-row-one .search-filter{border:2px solid #c7c7c7;border-radius:2px}.rtl .grid-container .filter-row-one .search-filter .control{border:none;padding-right:10px}.rtl .grid-container .filter-row-one .search-filter .icon-wrapper{padding-top:2px;padding-right:5px;border:none;border-right:2px solid #c7c7c7;border-radius:0}.rtl .grid-container .filter-row-two .filter-tag .icon.cross-icon,.rtl .grid-container .filter-row-two .filter-tag .wrapper{margin-right:10px;margin-left:0}.rtl .grid-container .filter-row-one .dropdown-filters{right:unset;position:static!important;left:25px}.rtl .grid-container .filter-row-one .dropdown-filters .per-page-label{position:static!important}.rtl .grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header span{padding-right:5px}.rtl .grid-container .table tbody td.action a:first-child{margin-left:10px;margin-right:0}.rtl .table table{text-align:right}.rtl .table table .massaction-remove{margin-right:5px!important;margin-left:10px}.rtl .table table .btn.btn-primary{margin-right:10px!important}.rtl .dropdown-list.bottom-right{left:0;right:auto}.rtl .dropdown-list .dropdown-container{text-align:right}.rtl .accordian .accordian-header .icon{float:left}.rtl .tree-container .tree-item{padding-right:30px}.rtl .tree-container .tree-item .expand-icon,.rtl .tree-container .tree-item .folder-icon{margin-left:10px;margin-right:0}.rtl .tree-container>.tree-item{padding-right:0}.rtl .radio .radio-view{margin-left:5px}.rtl .image-wrapper .image-item{margin-right:0;margin-left:20px}.rtl .image-wrapper .image-item .remove-image{margin-right:0}.rtl .control-group label.required:before{content:"*";color:#fc6868;font-weight:700}.rtl .control-group label.required:after{content:none}.rtl .control-group label .locale{float:left}.rtl .pagination .page-item .icon{transform:rotate(180deg)}.accordian-header{background-color:#fbfbfb}.btn.btn-primary{background:#0041ff}.fixed-action{top:108px}.fixed-action,.fixed-action-slight{position:fixed;right:32px;z-index:20}.fixed-action-slight{top:94px}.pagination{margin-top:30px} \ No newline at end of file diff --git a/packages/Webkul/Admin/publishable/assets/mix-manifest.json b/packages/Webkul/Admin/publishable/assets/mix-manifest.json index 6288b3d46..5e933c43a 100755 --- a/packages/Webkul/Admin/publishable/assets/mix-manifest.json +++ b/packages/Webkul/Admin/publishable/assets/mix-manifest.json @@ -1,4 +1,4 @@ { "/js/admin.js": "/js/admin.js?id=a14c779523092ac32b88", - "/css/admin.css": "/css/admin.css?id=5002aa6219af1ce7629b" + "/css/admin.css": "/css/admin.css?id=c17742537767f5fbf06d" } diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php index da1c7d9dd..fcc2f3399 100755 --- a/packages/Webkul/Admin/src/Config/acl.php +++ b/packages/Webkul/Admin/src/Config/acl.php @@ -416,6 +416,26 @@ return [ 'name' => 'admin::app.acl.delete', 'route' => 'admin.cart-rules.delete', 'sort' => 3, + ], [ + 'key' => 'promotions.catalog-rules', + 'name' => 'admin::app.acl.catalog-rules', + 'route' => 'admin.catalog-rules.index', + 'sort' => 1, + ], [ + 'key' => 'promotions.catalog-rules.create', + 'name' => 'admin::app.acl.create', + 'route' => 'admin.catalog-rules.index', + 'sort' => 1, + ], [ + 'key' => 'promotions.catalog-rules.edit', + 'name' => 'admin::app.acl.edit', + 'route' => 'admin.catalog-rules.edit', + 'sort' => 2, + ], [ + 'key' => 'promotions.catalog-rules.delete', + 'name' => 'admin::app.acl.delete', + 'route' => 'admin.catalog-rules.delete', + 'sort' => 3, ], ]; diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index d172ce65b..434020623 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -45,8 +45,6 @@ class ProductDataGrid extends DataGrid if ($this->locale !== 'all') { $queryBuilder->where('locale', $this->locale); - } else { - $queryBuilder->whereNotNull('product_flat.name'); } if ($this->channel !== 'all') { diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dashboard.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dashboard.scss index 553a6a476..994d59467 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dashboard.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dashboard.scss @@ -173,4 +173,17 @@ grid-row-gap: 15px; margin-top: 30px; } +} + +.rtl { + .dashboard { + .page-header { + .control-group { + &.date::after { + margin-top: -13px !important; + right: 100%; + } + } + } + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss index 292be7b7c..bb659cf99 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss @@ -319,4 +319,39 @@ body { margin-top: 10px; margin-bottom: 5px; } +} + +.ticket-list { + .control-group { + &.date { + &::after { + left: unset; + right: 10px; + top: 34px; + } + } + + &.has-error { + &.date { + &::after { + top: 47px; + } + } + } + } +} + +.rtl { + .ticket-list { + .control-group { + &.has-error { + &.date { + &::after { + top: 47px; + right: 100% !important; + } + } + } + } + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss index 94e2b6272..543e8d260 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss @@ -47,24 +47,6 @@ .control-group { margin-right: 20px; margin-left: 0px; - - &.has-error.date, &.has-error.date { - &::after { - margin-top: -12px; - } - } - } - - .control-group.date { - &::after { - margin-top: 6px; - position: absolute; - margin-right: -35px; - } - - &:last-child { - margin-left: 0px; - } } } @@ -242,13 +224,6 @@ float: left; } - .control-group.date { - &::after { - margin-right: -34px; - right: 70%; - } - } - .pagination .page-item .icon { transform: rotate(180deg); } diff --git a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php index 8de719884..a04865be1 100755 --- a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php @@ -369,11 +369,11 @@ diff --git a/packages/Webkul/BookingProduct/publishable/assets/css/default-booking.css b/packages/Webkul/BookingProduct/publishable/assets/css/default-booking.css index 6d377cee0..af4510c73 100644 --- a/packages/Webkul/BookingProduct/publishable/assets/css/default-booking.css +++ b/packages/Webkul/BookingProduct/publishable/assets/css/default-booking.css @@ -1 +1 @@ -.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px;border-top:1px solid #e8e8e8;padding-top:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;width:10px;height:10px;margin-left:5px;top:0}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{padding-top:25px;display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{top:16px;left:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px;border-top:1px solid #e8e8e8}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px} \ No newline at end of file +.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px;border-top:1px solid #e8e8e8;padding-top:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;width:10px;height:10px;margin-left:5px;top:0}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{padding-top:25px;display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{top:16px;left:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date .cross-icon,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date .cross-icon{margin-left:-48px;top:20px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).has-error.date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).has-error.date:after{margin-top:0}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px;border-top:1px solid #e8e8e8}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px} \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css b/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css index 3624dce6d..a0350f22c 100644 --- a/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css +++ b/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css @@ -1 +1 @@ -.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;display:inline-block;width:8px;height:8px;margin-left:5px;top:-1px}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{position:absolute;top:14px;right:10px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px}.form-group{position:relative}.form-group.date:after,.form-group.datetime:after{background-image:url(../images/Icon-Calendar.svg);width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px;top:3px!important;pointer-events:none} \ No newline at end of file +.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;display:inline-block;width:8px;height:8px;margin-left:5px;top:-1px}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{position:absolute;top:14px;right:10px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date .cross-icon,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date .cross-icon{margin-left:-48px;top:20px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).has-error.date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).has-error.date:after{margin-top:0}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px}.form-group{position:relative}.form-group.date:after,.form-group.datetime:after{background-image:url(../images/Icon-Calendar.svg);width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px;top:3px!important;pointer-events:none} \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json b/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json index f2a6fca65..4ca359d92 100644 --- a/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json +++ b/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/default-booking.css": "/css/default-booking.css?id=ab5abfabd8e0f6df6466", - "/css/velocity-booking.css": "/css/velocity-booking.css?id=fb0d5b9e37ed77d662d1" + "/css/default-booking.css": "/css/default-booking.css?id=76de1f2b8e064c1e9043", + "/css/velocity-booking.css": "/css/velocity-booking.css?id=847aebb5031ed219528e" } diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/sass/default.scss b/packages/Webkul/BookingProduct/src/Resources/assets/sass/default.scss index 92eaa6b03..d00e381f6 100644 --- a/packages/Webkul/BookingProduct/src/Resources/assets/sass/default.scss +++ b/packages/Webkul/BookingProduct/src/Resources/assets/sass/default.scss @@ -133,6 +133,19 @@ top: 16px; left: 100%; } + + .cross-icon { + margin-left: -48px; + top: 20px; + } + } + + &.has-error { + &.date { + &::after { + margin-top: 0px; + } + } } &.slots { diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss b/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss index 17637393b..26eaead82 100644 --- a/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss +++ b/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss @@ -132,6 +132,19 @@ top: 14px; right: 10px; } + + .cross-icon { + margin-left: -48px; + top: 20px; + } + } + + &.has-error { + &.date { + &::after { + margin-top: 0px; + } + } } &.slots { diff --git a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php index 4752f4c64..a8d4802d2 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php @@ -1,10 +1,5 @@ @section('css') @stop @@ -48,7 +38,9 @@
- + + + @{{ errors.first(controlName + '[special_price_from]') }} @@ -96,7 +96,7 @@ - + @{{ errors.first(controlName + '[special_price_to]') }} diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/rental.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/rental.blade.php index 5c5b7e6f3..d29a70bd3 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/rental.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/rental.blade.php @@ -123,7 +123,7 @@ selected_slot: '', - slot_from: 0, + slot_from: '', date_from: '', @@ -179,7 +179,7 @@ .then (function(response) { this_this.selected_slot = ''; - this_this.slot_from = 0; + this_this.slot_from = ''; this_this.slots = response.data.data; }) diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php index 9fed24a4d..91e7ccb3c 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php @@ -123,7 +123,7 @@ selected_slot: '', - slot_from: 0, + slot_from: '', date_from: '', @@ -179,7 +179,7 @@ .then (function(response) { this_this.selected_slot = ''; - this_this.slot_from = 0; + this_this.slot_from = ''; this_this.slots = response.data.data; }) diff --git a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php index 3155aae16..583f16069 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php @@ -2,10 +2,13 @@ namespace Webkul\Customer\Http\Controllers; +use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Support\Facades\Password; class ForgotPasswordController extends Controller { + use SendsPasswordResetEmails; + /** * Contains route related configuration * diff --git a/packages/Webkul/Paypal/src/Helpers/Ipn.php b/packages/Webkul/Paypal/src/Helpers/Ipn.php index d511a1ecb..18b501401 100755 --- a/packages/Webkul/Paypal/src/Helpers/Ipn.php +++ b/packages/Webkul/Paypal/src/Helpers/Ipn.php @@ -100,7 +100,7 @@ class Ipn { if ($this->post['payment_status'] == 'Completed') { if ($this->post['mc_gross'] != $this->order->grand_total) { - + return; } else { $this->orderRepository->update(['status' => 'processing'], $this->order->id); diff --git a/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php b/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php index 895e3e209..7eeb89c7b 100644 --- a/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php @@ -32,6 +32,7 @@ $factory->define(OrderItem::class, function (Faker $faker, array $attributes) { 'qty_invoiced' => 0, 'qty_canceled' => 0, 'qty_refunded' => 0, + 'additional' => [], 'order_id' => function () { return factory(Order::class)->create()->id; }, diff --git a/packages/Webkul/Shop/src/Config/system.php b/packages/Webkul/Shop/src/Config/system.php new file mode 100644 index 000000000..b2d435f39 --- /dev/null +++ b/packages/Webkul/Shop/src/Config/system.php @@ -0,0 +1,20 @@ + 'general.content.shop', + 'name' => 'shop::app.products.settings', + 'sort' => 1, + 'fields' => [ + [ + 'name' => 'compare_option', + 'title' => 'shop::app.products.compare_options', + 'type' => 'boolean', + 'locale_based' => true, + 'channel_based' => true, + ], + ], + ] +]; + +?> \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php index 900537edf..ff4f4a67e 100755 --- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php +++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php @@ -81,5 +81,9 @@ class ShopServiceProvider extends ServiceProvider $this->mergeConfigFrom( dirname(__DIR__) . '/Config/menu.php', 'menu.customer' ); + + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/system.php', 'core' + ); } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index c00fd1a6f..3745244dd 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php @@ -418,6 +418,8 @@ return [ 'total-amount' => 'المبلغ الإجمالي', 'none' => 'لا شيء', 'available-for-order' => 'متوفر لطلب الشراء', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php index bf17a8a9c..fa3c28ce3 100755 --- a/packages/Webkul/Shop/src/Resources/lang/de/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php @@ -414,7 +414,9 @@ return [ 'your-customization' => 'Ihre Anpassung', 'total-amount' => 'Gesamtmenge', 'none' => 'Keine', - 'available' => 'Verfügbar' + 'available' => 'Verfügbar', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 37719ef22..6f34fb354 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -417,7 +417,9 @@ return [ 'your-customization' => 'Your Customization', 'total-amount' => 'Total Amount', 'none' => 'None', - 'available-for-order' => 'Available for Order' + 'available-for-order' => 'Available for Order', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index 7a2a18c09..419be465e 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -388,6 +388,8 @@ return [ 'select-above-options' => 'Primero selecciona las opciones de arriba.', 'less-quantity' => 'La cantidad no debe ser inferior a uno.', 'available-for-order' => 'Disponible para ordenar', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php index 5860afe80..73b2a7804 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -417,6 +417,8 @@ return [ 'total-amount' => 'مقدار کل', 'none' => 'هیچ یک', 'available-for-order' => 'Available for Order', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php index 843b6c703..b9ab283ea 100644 --- a/packages/Webkul/Shop/src/Resources/lang/it/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php @@ -416,7 +416,9 @@ return [ 'your-customization' => 'La tua Personalizzazione', 'total-amount' => 'Totale', 'none' => 'Nessuno', - 'available-for-order' => 'Disponibile per lordine' + 'available-for-order' => 'Disponibile per lordine', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ @@ -583,7 +585,7 @@ return [ 'subject' => 'Nuovo commento aggiunto al tuo ordine', 'dear' => ':customer_name', 'final-summary' => 'Grazie per aver mostrato interesse per il nostro store', - 'help' => 'Se hai bisogno di aiuto contattaci all'indirizzo :support_email', + 'help' => 'Se hai bisogno di aiuto contattaci all\'indirizzo :support_email', 'thanks' => 'Graze!', ], diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php index fb5fb6d55..ca525c8cd 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php @@ -384,6 +384,8 @@ return [ 'select-above-options' => '最初に上記のオプションを選択してください.', 'less-quantity' => '数量１未満は選択できません.', 'available-for-order' => '注文可能', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], 'buynow' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index 76883f742..cdbff6eff 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -421,7 +421,9 @@ return [ 'your-customization' => 'Uw maatwerk', 'total-amount' => 'Totale hoeveelheid', 'none' => 'Geen', - 'available-for-order' => 'Beschikbaar voor bestelling' + 'available-for-order' => 'Beschikbaar voor bestelling', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php index 9231be6c8..47b2c2768 100644 --- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php @@ -416,7 +416,9 @@ return [ 'your-customization' => 'Twoja personalizacja', 'total-amount' => 'Całkowita kwota', 'none' => 'Żaden', - 'available-for-order' => 'Dostępne na zamówienie' + 'available-for-order' => 'Dostępne na zamówienie', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ @@ -528,7 +530,7 @@ return [ 'total' => [ 'order-summary' => 'Podsumowanie zamówienia', - 'sub-total' => 'Produkty, + 'sub-total' => 'Produkty', 'grand-total' => 'Suma łączna', 'delivery-charges' => 'Koszty dostawy', 'tax' => 'Podatek', @@ -594,7 +596,7 @@ return [ 'discount' => 'Rabat', 'grand-total' => 'Suma łączna', 'final-summary' => 'Dziękujemy za zakupy w naszym sklepie', - 'help' => ''Jeśli potrzebujesz jakiejkolwiek pomocy, skontaktuj się z nami pod adresem :support_email', + 'help' => 'Jeśli potrzebujesz jakiejkolwiek pomocy, skontaktuj się z nami pod adresem :support_email', 'thanks' => 'Dzięki!', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php index c48c219de..f2472cc58 100755 --- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php @@ -404,7 +404,9 @@ return [ 'your-customization' => 'Sua personalização', 'total-amount' => 'Valor total', 'none' => 'Nenhum', - 'available-for-order' => 'Disponível para encomenda' + 'available-for-order' => 'Disponível para encomenda', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php index fee5e3a7d..de24e40b7 100644 --- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php @@ -414,7 +414,9 @@ return [ 'your-customization' => 'Özelleştirmeniz', 'total-amount' => 'Toplam Miktar', 'none' => 'Hiçbiri', - 'available-for-order' => 'Sipariş İçin Uygun' + 'available-for-order' => 'Sipariş İçin Uygun', + 'settings' => 'Settings', + 'compare_options' => 'Compare Options', ], // 'reviews' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php index e0c9611dc..1214bfbd3 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php @@ -9,6 +9,16 @@