From 33c5a389a9979e984dc8945477ce1992fd23e4b4 Mon Sep 17 00:00:00 2001 From: suresh Date: Thu, 22 Jun 2023 18:34:22 +0530 Subject: [PATCH 1/4] suresh --- app/Config/App.php | 4 +- app/Views/cart.php | 2 +- app/Views/checkout.php | 159 +++++++++++------------ app/Views/membership.php | 12 +- composer.lock | 50 +++---- public/assets/member_css/front-style.css | 26 +++- 6 files changed, 130 insertions(+), 123 deletions(-) diff --git a/app/Config/App.php b/app/Config/App.php index b103d26..094c0f2 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -18,8 +18,8 @@ class App extends BaseConfig * http://example.com/ */ // public string $baseURL = 'https://mprkv.co.in/devbook'; - // public string $baseURL = 'http://localhost/golf_backend'; - public string $baseURL = 'http://localhost:88/golf_backend'; + public string $baseURL = 'http://localhost/golf_backend'; + // public string $baseURL = 'http://localhost:88/golf_backend'; /** diff --git a/app/Views/cart.php b/app/Views/cart.php index 53ee60e..876502f 100644 --- a/app/Views/cart.php +++ b/app/Views/cart.php @@ -134,7 +134,7 @@ echo '
'; } else { - echo '
'; + echo '
'; } ?>
diff --git a/app/Views/checkout.php b/app/Views/checkout.php index 7df19dc..e588181 100644 --- a/app/Views/checkout.php +++ b/app/Views/checkout.php @@ -249,23 +249,14 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- - - - - - - -
+
- -
@@ -312,7 +303,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
-
+
@@ -373,13 +364,8 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
-
-
- -
+ + @@ -390,76 +376,10 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
-

Payment Method

- - - -
- - - - -
- -
- -
- - - - - - - - - -
- - - -
- - -
- -
- -
- - - - - - - -
-
- - -
+
@@ -536,9 +456,78 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
+ +
+
+ +
+
+ +

Payment Method

+ +
+ +
+ +
+ +
+ +
+ + + + + + + + + +
+ + + +
+ +
+ +
+ + + + + +
+
+ +
+
diff --git a/app/Views/membership.php b/app/Views/membership.php index 5eff6bd..bd7f10e 100644 --- a/app/Views/membership.php +++ b/app/Views/membership.php @@ -50,19 +50,19 @@
-
+
-
+

Evo Membership

-

It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using ‘Content here, content here’, making it look like readable English.

+

Elevate your golfing experience with our exclusive membership program designed for golf enthusiasts like you. With our credit pack, you gain access to our state-of-the-art golf simulators, allowing you to practice your swing, improve your skills, and enjoy virtual rounds of golf on some of the world's most renowned courses. Our Evo Membership offers flexibility and convenience, allowing you to redeem credits at your own pace and explore various simulation options. Whether you're a beginner looking to learn the game or a seasoned golfer seeking to enhance your technique, our golf simulator credit pack is your ticket to endless enjoyment on the greens. Join our Evo Membership today and take your golfing journey to new heights.

-
+
@@ -127,7 +127,7 @@ 1 hr Practice / Play$602 1/2 hr individual coaching$903 1 hr individual coaching$1505 - Fitting Session + Fitting Session Single fitting (driver, irons or woods)$1204 2 hr full bag fitting (Driver, woods, irons, wedges)$2107 @@ -245,7 +245,7 @@ -
+
diff --git a/composer.lock b/composer.lock index 422f8c0..d5c0a08 100644 --- a/composer.lock +++ b/composer.lock @@ -186,16 +186,16 @@ }, { "name": "codeigniter4/framework", - "version": "v4.3.5", + "version": "v4.3.6", "source": { "type": "git", "url": "https://github.com/codeigniter4/framework.git", - "reference": "b41bca4ff6efd9baffdb7a1bba33f946fb8580d9" + "reference": "e3921233a20daf05ae9d2b50ca41ce97748e1d6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/codeigniter4/framework/zipball/b41bca4ff6efd9baffdb7a1bba33f946fb8580d9", - "reference": "b41bca4ff6efd9baffdb7a1bba33f946fb8580d9", + "url": "https://api.github.com/repos/codeigniter4/framework/zipball/e3921233a20daf05ae9d2b50ca41ce97748e1d6d", + "reference": "e3921233a20daf05ae9d2b50ca41ce97748e1d6d", "shasum": "" }, "require": { @@ -256,7 +256,7 @@ "slack": "https://codeigniterchat.slack.com", "source": "https://github.com/codeigniter4/CodeIgniter4" }, - "time": "2023-05-21T13:41:12+00:00" + "time": "2023-06-17T23:13:38+00:00" }, { "name": "daycry/cronjob", @@ -369,16 +369,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.6.0", + "version": "v6.8.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "5a9cf79b4a2eb347230384648cc7b0d68cd97faa" + "reference": "48b0210c51718d682e53210c24d25c5a10a2299b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5a9cf79b4a2eb347230384648cc7b0d68cd97faa", - "reference": "5a9cf79b4a2eb347230384648cc7b0d68cd97faa", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b", + "reference": "48b0210c51718d682e53210c24d25c5a10a2299b", "shasum": "" }, "require": { @@ -426,9 +426,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.6.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.8.0" }, - "time": "2023-06-13T17:11:06+00:00" + "time": "2023-06-20T16:45:35+00:00" }, { "name": "google/apiclient", @@ -501,7 +501,7 @@ }, { "name": "google/apiclient-services", - "version": "v0.304.0", + "version": "v0.305.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", @@ -539,7 +539,7 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.304.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.305.0" }, "time": "2023-06-07T02:11:36+00:00" }, @@ -2308,16 +2308,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.22.0", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2" + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2", - "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", "shasum": "" }, "require": { @@ -2370,9 +2370,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.22.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0" }, - "time": "2023-05-14T12:31:37+00:00" + "time": "2023-06-12T08:44:38+00:00" }, { "name": "mikey179/vfsstream", @@ -2971,16 +2971,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", "shasum": "" }, "require": { @@ -3054,7 +3054,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" }, "funding": [ { @@ -3070,7 +3070,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-06-11T06:13:56+00:00" }, { "name": "psr/container", diff --git a/public/assets/member_css/front-style.css b/public/assets/member_css/front-style.css index 4704b8e..9a4b8a2 100644 --- a/public/assets/member_css/front-style.css +++ b/public/assets/member_css/front-style.css @@ -429,6 +429,9 @@ body.cart .quantity{ body.checkout .select2-container, body.checkout span.selection{ padding:0!important; } +body.checkout span.select2{ + width:100%!important; +} body.checkout .select2-container--default .select2-selection--single{ border: 2px solid #E5E7EB; height:40px; @@ -513,6 +516,11 @@ body.checkout .select2-container--default .select2-selection--single .select2-s border-radius:5px; } + @media (max-width: 768px){ + .checkmark{ + top:8px!important; + } + } /* When the checkbox is checked, add a blue background */ @@ -567,7 +575,7 @@ body.checkout .select2-container--default .select2-selection--single .select2-s } .presale-offer-section{ background:#f8f8f4; - padding: 80px 0 80px 0; + padding:60px 0 60px 0; } @media (min-width: 768px){ .membership-img{ @@ -888,8 +896,7 @@ body.checkout .select2-container--default .select2-selection--single .select2-s background: #FFFFFF; box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.1); border-radius: 5px; - padding: 30px; - margin-bottom:50px; + padding: 30px; } .order-summary h4{ font-size: 22px; @@ -935,11 +942,13 @@ body.checkout .select2-container--default .select2-selection--single .select2-s .checkout .product-price, .checkout .product-total{ font-weight:500; } +@media (min-width: 992px){ .checkout-inner .order-summary-main{ position: sticky; - top: 0; + top: 15px; height: 100%; } +} /*----------------------------- Checkout End------------------------- */ /*--------------Payment Sucessful Start ----------*/ @@ -1657,6 +1666,15 @@ body.checkout .select2-container--default .select2-selection--single .select2-s box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; max-width:500px; } +.credit-table .fit-session{ + background-color: var(--pink-color); +} +.credit-table .fit-session td{ + border-width:0; + text-align:center; + color:#ffffff; + font-weight: 600; +} .credit-table table{ border-collapse: collapse; width:100%; From bbf4b0755f7608309fd6acd6ff2f74ceb2729f7c Mon Sep 17 00:00:00 2001 From: suresh Date: Thu, 22 Jun 2023 19:00:04 +0530 Subject: [PATCH 2/4] suresh --- app/Config/App.php | 4 ++-- app/Views/member_layout/header.php | 2 +- app/Views/membership.php | 6 +++--- public/assets/member_css/front-style.css | 26 ++++++++++++++++++++++-- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app/Config/App.php b/app/Config/App.php index 094c0f2..9f738af 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -18,8 +18,8 @@ class App extends BaseConfig * http://example.com/ */ // public string $baseURL = 'https://mprkv.co.in/devbook'; - public string $baseURL = 'http://localhost/golf_backend'; - // public string $baseURL = 'http://localhost:88/golf_backend'; + //public string $baseURL = 'http://localhost/golf_backend'; + public string $baseURL = 'http://localhost:88/golf_backend'; /** diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php index 8edc09e..7117dbb 100644 --- a/app/Views/member_layout/header.php +++ b/app/Views/member_layout/header.php @@ -77,7 +77,7 @@