Deployment Started . . . . . From https://gitlab.com/gligx/musawer * branch development -> FETCH_HEAD 61514966..cbea25fd development -> origin/development Updating 61514966..cbea25fd Fast-forward app/Http/Controllers/Web/AccountController.php | 24 +++++- app/Http/Controllers/Web/CartController.php | 6 +- app/Http/Controllers/Web/CheckoutController.php | 9 +- .../Requests/Web/Account/PasswordUpdateRequest.php | 54 ++++++++++++ app/Mail/Web/BookingItemCancelAcceptMail.php | 97 ++++++++++++++++++++++ app/Mail/Web/BookingItemCancelDeclineMail.php | 97 ++++++++++++++++++++++ app/Mail/Web/BookingItemScheduledEmail.php | 3 +- app/Repositories/Order/OrderRepository.php | 33 +++++++- .../Order/OrderRepositoryInterface.php | 4 +- .../2022_04_04_123119_booking_completed_sms.php | 4 +- ...2022_04_21_090108_booking_item_cancel_mails.php | 46 ++++++++++ resources/css/account/changePassword.scss | 15 ++++ resources/js/account/changePassword.js | 36 ++++++++ resources/js/cart/selectSlot.js | 8 +- resources/lang/ar/account/account.php | 5 ++ resources/lang/ar/account/changePassword.php | 13 +++ resources/lang/en/account/account.php | 1 + resources/lang/en/account/changePassword.php | 13 +++ .../views/web/account/changePassword.blade.php | 43 ++++++++++ .../views/web/account/loyaltyPoints.blade.php | 10 ++- resources/views/web/account/profile.blade.php | 10 ++- resources/views/web/cart/selectSlot.blade.php | 2 +- resources/views/web/checkout/review.blade.php | 4 +- resources/views/web/checkout/thankYou.blade.php | 2 +- resources/views/web/layouts/topbar.blade.php | 4 +- routes/web.php | 2 + webpack.mix.js | 3 + 27 files changed, 518 insertions(+), 30 deletions(-) create mode 100644 app/Http/Requests/Web/Account/PasswordUpdateRequest.php create mode 100644 app/Mail/Web/BookingItemCancelAcceptMail.php create mode 100644 app/Mail/Web/BookingItemCancelDeclineMail.php create mode 100644 database/migrations/2022_04_21_090108_booking_item_cancel_mails.php create mode 100644 resources/css/account/changePassword.scss create mode 100644 resources/js/account/changePassword.js create mode 100644 resources/lang/ar/account/changePassword.php create mode 100644 resources/lang/en/account/changePassword.php create mode 100644 resources/views/web/account/changePassword.blade.php up to date, audited 954 packages in 5s 91 packages are looking for funding run `npm fund` for details 9 vulnerabilities (2 moderate, 6 high, 1 critical) To address issues that do not require attention, run: npm audit fix To address all issues possible (including breaking changes), run: npm audit fix --force Some issues need review, and may require choosing a different dependency. Run `npm audit` for details. > dev > npm run development > development > mix ℹ Compiling Mix  Laravel Mix v6.0.43 ✔ Compiled Successfully in 22843ms ┌───────────────────────────────────┬───────────┐ │ File │ Size │ ├───────────────────────────────────┼───────────┤ │ /images/web/about-bg-1.jpg │ 95.3 KiB │ │ /images/web/about-bg-1.png │ 727 KiB │ │ /images/web/about-bg-1.svg │ 2.51 MiB │ │ /images/web/about-bg-img-1.png │ 406 KiB │ │ /images/web/about-img-1.jpg │ 108 KiB │ │ /images/web/about-img-1.png │ 961 KiB │ │ /images/web/about-img-2.png │ 651 KiB │ │ /images/web/about-img-3.png │ 1.33 MiB │ │ /images/web/about-img-4.png │ 1.11 MiB │ │ /images/web/arrow.png │ 28.1 KiB │ │ /images/web/avatar.png │ 727 bytes │ │ /images/web/back-arrow-1.png │ 282 bytes │ │ /images/web/back-arrow-1.svg │ 650 bytes │ │ /images/web/back-logo.png │ 5.36 KiB │ │ /images/web/back-logo.svg │ 664 bytes │ │ /images/web/banner-1.jpg │ 194 KiB │ │ /images/web/bg-1.jpg │ 63.2 KiB │ │ …ages/web/bg-about-section-2.jpg │ 48.1 KiB │ │ /images/web/cart-img-1.png │ 383 KiB │ │ /images/web/cart-img-2.png │ 291 KiB │ │ /images/web/cart-img-3.png │ 279 KiB │ │ /images/web/cart-list-img-1.png │ 12.4 KiB │ │ /images/web/cart-list-img-2.png │ 15.3 KiB │ │ /images/web/contact-icon-1.png │ 12.5 KiB │ │ /images/web/contact-icon-2.png │ 7.28 KiB │ │ /images/web/contact-icon-3.png │ 24.3 KiB │ │ …es/web/content-bg-email.png.png │ 5.36 KiB │ │ …web/corporate-photography-1.png │ 274 KiB │ │ /images/web/favicon.png │ 13.8 KiB │ │ /images/web/header-bg-email.png │ 88.2 KiB │ │ /images/web/highlight-img-1.png │ 554 KiB │ │ /images/web/highlight-img-2.png │ 390 KiB │ │ /images/web/highlight-img-3.png │ 377 KiB │ │ /images/web/login-mob-img.png │ 926 KiB │ │ /images/web/logo-2.png │ 103 KiB │ │ /images/web/logo-dark.png │ 6.03 KiB │ │ /images/web/logo-light.png │ 6.01 KiB │ │ /images/web/logo-overlay.svg │ 649 bytes │ │ /images/web/logo.png │ 10.8 KiB │ │ /images/web/loyalty-active.png │ 2.7 KiB │ │ /images/web/loyalty-inactive.png │ 2.47 KiB │ │ /images/web/mouse-over.png │ 4.03 KiB │ │ /images/web/order-progress-1.PNG │ 18.1 KiB │ │ /images/web/p-img-1.png │ 274 KiB │ │ /images/web/p-img-2.png │ 205 KiB │ │ /images/web/p-img-3.png │ 226 KiB │ │ /images/web/p-img-4.png │ 186 KiB │ │ /images/web/p-img-5.png │ 230 KiB │ │ /images/web/p-img-6.png │ 199 KiB │ │ /images/web/p-img-7.png │ 188 KiB │ │ /images/web/p-img-8.jpg │ 35 KiB │ │ /images/web/p-img-9.jpg │ 55.8 KiB │ │ /images/web/package-bg-1.png │ 1.74 MiB │ │ /images/web/package-img-1.png │ 181 KiB │ │ /images/web/photography-1.jpg │ 19.5 KiB │ │ /images/web/photography-2.jpg │ 18.9 KiB │ │ /images/web/photography-3.jpg │ 63.3 KiB │ │ /images/web/photography-4.jpg │ 23.7 KiB │ │ /images/web/photography-5.jpg │ 24.1 KiB │ │ /images/web/photography-6.jpg │ 27.5 KiB │ │ …ages/web/photography-banner.jpg │ 185 KiB │ │ /images/web/photography-img-1.png │ 155 KiB │ │ /images/web/photography-img-2.png │ 166 KiB │ │ /images/web/photography-img-3.png │ 291 KiB │ │ /images/web/popup-img-1.png │ 66.3 KiB │ │ /images/web/profile-points.png │ 7.89 KiB │ │ /images/web/profile-points.svg │ 5.93 KiB │ │ /images/web/register-bg-1.png │ 1.22 MiB │ │ /images/web/slide-img-1.jpg │ 53.3 KiB │ │ /images/web/slide-img-2.jpg │ 66.1 KiB │ │ /images/web/slide-img-3.jpg │ 27.9 KiB │ │ /images/web/slide-img-4.jpg │ 63.4 KiB │ │ /images/web/video-banner.jpg │ 58.5 KiB │ │ /js/web/account/account.js │ 1.08 MiB │ │ …eb/account/addBillingAddress.js │ 1.2 KiB │ │ …web/account/billingAddresses.js │ 2.03 KiB │ │ /js/web/account/changePassword.js │ 883 KiB │ │ …b/account/editBillingAddress.js │ 1.2 KiB │ │ /js/web/account/loyaltyPoints.js │ 242 bytes │ │ /js/web/account/myBookings.js │ 2.7 KiB │ │ /js/web/account/myOrders.js │ 2.64 KiB │ │ /js/web/account/profile.js │ 1.26 KiB │ │ …eb/account/quotationRequests.js │ 3.49 KiB │ │ /js/web/auth/login.js │ 943 KiB │ │ /js/web/auth/passwords/email.js │ 484 bytes │ │ /js/web/auth/register.js │ 981 KiB │ │ /js/web/auth/registerSuccess.js │ 847 KiB │ │ /js/web/auth/reset.js │ 883 KiB │ │ /js/web/cart/addNote.js │ 270 bytes │ │ /js/web/cart/cart.js │ 849 KiB │ │ /js/web/cart/selectLocation.js │ 855 KiB │ │ /js/web/cart/selectSlot.js │ 2.32 MiB │ │ …eb/categories/listCategories.js │ 847 KiB │ │ /js/web/checkout/billing.js │ 847 KiB │ │ /js/web/checkout/review.js │ 847 KiB │ │ /js/web/checkout/thankYou.js │ 847 KiB │ │ /js/web/cms/aboutUs.js │ 847 KiB │ │ /js/web/cms/privacyPolicy.js │ 847 KiB │ │ /js/web/cms/termsAndConditions.js │ 847 KiB │ │ /js/web/contact/contact.js │ 906 KiB │ │ /js/web/home/search.js │ 847 KiB │ │ /js/web/home/welcome.js │ 938 KiB │ │ /js/web/packages/listPackages.js │ 847 KiB │ │ /js/web/packages/viewPackage.js │ 935 KiB │ │ /js/web/quote/createNew.js │ 980 KiB │ │ /js/web/services/listServices.js │ 847 KiB │ │ /js/web/services/viewService.js │ 936 KiB │ │ css/web/account/account.css │ 33.8 KiB │ │ …/web/account/changePassword.css │ 258 bytes │ │ css/web/auth/login.css │ 6.92 KiB │ │ css/web/auth/register.css │ 11.6 KiB │ │ css/web/auth/registerSuccess.css │ 6.77 KiB │ │ css/web/auth/reset.css │ 258 bytes │ │ css/web/cart/cart.css │ 5.38 KiB │ │ css/web/cart/selectLocation.css │ 1.88 KiB │ │ css/web/cart/selectSlot.css │ 42.2 KiB │ │ …b/categories/listCategories.css │ 3.61 KiB │ │ css/web/checkout/billing.css │ 6.41 KiB │ │ css/web/checkout/review.css │ 7.36 KiB │ │ css/web/checkout/thankYou.css │ 812 bytes │ │ css/web/cms/aboutUs.css │ 6.51 KiB │ │ css/web/cms/privacyPolicy.css │ 173 bytes │ │ …/web/cms/termsAndConditions.css │ 116 bytes │ │ css/web/contact/contact.css │ 3.86 KiB │ │ css/web/home/search.css │ 556 bytes │ │ css/web/home/welcome.css │ 13.7 KiB │ │ css/web/layout/guest.css │ 334 KiB │ │ css/web/layout/musawer.css │ 380 KiB │ │ css/web/packages/listPackages.css │ 3.63 KiB │ │ css/web/packages/viewPackage.css │ 7.97 KiB │ │ css/web/quote/createNew.css │ 6.42 KiB │ │ css/web/services/listServices.css │ 1.16 KiB │ │ css/web/services/viewService.css │ 6.74 KiB │ │ …b43027f47b20503057dfbbaa9401fef │ 162 KiB │ │ …1e38fd9e0e74ba58f7a2b77ef29fdd3 │ 434 KiB │ │ …e59d2330b4c6deb84b340635ed36249 │ 162 KiB │ │ …0fd1704ea223900efa9fd4e869efb08 │ 75.4 KiB │ │ …691f37e57f04c152e2315ab7dbad881 │ 95.7 KiB │ │ …8a8ec1846af02f021a4996de8c737f4 │ 664 bytes │ │ …ea96fc06895fb91bbf16e447d40afc4 │ 194 KiB │ │ …eaa10ee74d211c10932c96d9fa62bfb │ 48.1 KiB │ │ …f7ede2366c0715d0c2df935dd4ae1bf │ 649 bytes │ │ …0d8c0dae6a670131dda7f5e2e032d13 │ 4.03 KiB │ │ …8ea82d6f62391a8c9d092d17dc98b4f │ 1.22 MiB │ │ …8da4872304a16ac25d73b5a876821df │ 1.06 KiB │ │ …79aaaf3562eee12150cf7272b8a096c │ 1.04 KiB │ │ …d88b473e8163463bf3f09be519eadf8 │ 1.11 KiB │ │ …f3d89c056183663b2f98e0aa87293bd │ 1.04 KiB │ │ …e9d787c8969c93afa8d428ac319b746 │ 1.04 KiB │ │ …f01b07148f205f6e8258e92bbf652d9 │ 4.86 KiB │ │ …217f6dec69452bb800eb86af6b78766 │ 58.5 KiB │ └───────────────────────────────────┴───────────┘ ✔ Mix: Compiled successfully in 33.30s 1 WARNING in child compilations (Use 'stats.children: true' resp. '--stats-children' for more details) webpack compiled with 1 warning Installing dependencies from lock file (including require-dev) Verifying lock file contents can be installed on current platform. Nothing to install, update or remove Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover --ansi Discovered Package: barryvdh/laravel-debugbar Discovered Package: laravel/sail Discovered Package: laravel/sanctum Discovered Package: laravel/tinker Discovered Package: laravel/ui Discovered Package: nesbot/carbon Discovered Package: nunomaduro/collision Discovered Package: spatie/laravel-database-mail-templates Discovered Package: spatie/laravel-ignition Discovered Package: spatie/laravel-permission Discovered Package: yajra/laravel-datatables-oracle Package manifest generated successfully. 87 packages you are using are looking for funding. Use the `composer fund` command to find out more! Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover --ansi Discovered Package: barryvdh/laravel-debugbar Discovered Package: laravel/sail Discovered Package: laravel/sanctum Discovered Package: laravel/tinker Discovered Package: laravel/ui Discovered Package: nesbot/carbon Discovered Package: nunomaduro/collision Discovered Package: spatie/laravel-database-mail-templates Discovered Package: spatie/laravel-ignition Discovered Package: spatie/laravel-permission Discovered Package: yajra/laravel-datatables-oracle Package manifest generated successfully. Generated optimized autoload files containing 5933 classes Migrating: 2022_04_21_090108_booking_item_cancel_mails Migrated: 2022_04_21_090108_booking_item_cancel_mails (12.76ms) Cached events cleared successfully. Compiled views cleared successfully. Application cache cleared successfully. Route cache cleared successfully. Configuration cache cleared successfully. Compiled services and packages files removed successfully. Caches cleared successfully. Deploy finished . . . !