From b61beda148b36d18d8b4417f5134891a738cf019 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 28 Jun 2023 18:16:36 +0900 Subject: [PATCH 01/40] remove address management support --- app/Http/Controllers/StoreController.php | 86 ------------------- app/Models/Store/Address.php | 29 +------ resources/views/store/checkout/show.blade.php | 2 - .../views/store/objects/address.blade.php | 24 +----- .../views/store/objects/new_address.blade.php | 62 ------------- routes/web.php | 3 - 6 files changed, 7 insertions(+), 199 deletions(-) delete mode 100644 resources/views/store/objects/new_address.blade.php diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index f11dcdcf377..c94ca481095 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -20,21 +20,16 @@ public function __construct() { $this->middleware('auth', ['only' => [ 'getInvoice', - 'postNewAddress', - 'postUpdateAddress', ]]); if (!$this->isAllowRestrictedUsers()) { $this->middleware('check-user-restricted', ['only' => [ 'getInvoice', - 'postNewAddress', - 'postUpdateAddress', ]]); } $this->middleware('verify-user', ['only' => [ 'getInvoice', - 'postUpdateAddress', ]]); parent::__construct(); @@ -69,85 +64,4 @@ public function missingMethod($parameters = []) { abort(404); } - - public function postUpdateAddress() - { - $address_id = (int) Request::input('id'); - $address = Store\Address::find($address_id); - $order = $this->userCart(); - - if (!$address || $address->user_id !== Auth::user()->user_id) { - return error_popup('invalid address'); - } - - switch (Request::input('action')) { - default: - case 'use': - $order->address()->associate($address); - $order->save(); - - return ext_view('layout.ujs-reload', [], 'js'); - break; - case 'remove': - if ($order->address_id === $address_id) { - return error_popup('Address is being used for this order!'); - } - - if ($otherOrders = Store\Order::where('address_id', '=', $address_id)->first()) { - return error_popup('Address was used in a previous order!'); - } - - Store\Address::destroy($address_id); - - return ext_view('store.address-destroy', ['address_id' => $address_id], 'js'); - break; - } - } - - public function postNewAddress() - { - \Log::info(json_encode([ - 'tag' => 'NEW_ADDRESS', - 'user_id' => Auth::user()->user_id, - 'address' => Request::input('address'), - ])); - - $addressInput = get_params(request()->all(), 'address', [ - 'first_name', - 'last_name', - 'street', - 'city', - 'state', - 'zip', - 'country_code', - 'phone', - ]); - - $validator = Validator::make($addressInput, [ - 'first_name' => ['required'], - 'last_name' => ['required'], - 'street' => ['required', 'mixture'], - 'city' => ['required'], - 'state' => ['required'], - 'zip' => ['required', 'required'], - 'country_code' => ['required'], - 'phone' => ['required'], - ]); - - $addressInput['user_id'] = Auth::user()->user_id; - - if ($validator->fails()) { - return error_popup($validator->errors()->first()); - } - - $address = Store\Address::create($addressInput); - $address->user()->associate(Auth::user()); - $address->save(); - - $order = $this->userCart(); - $order->address()->associate($address); - $order->save(); - - return ext_view('layout.ujs-reload', [], 'js'); - } } diff --git a/app/Models/Store/Address.php b/app/Models/Store/Address.php index c2b5b3d9c3f..595ad6a08eb 100644 --- a/app/Models/Store/Address.php +++ b/app/Models/Store/Address.php @@ -58,31 +58,8 @@ public function countryName() public static function sender() { - //todo: move to database - switch (Auth::user()->user_id) { - default: - case 4916903: - return new self([ - 'first_name' => 'osu!store', - 'last_name' => '', - 'street' => 'Room 304, Build 700 Nishijin 7-7-1', - 'city' => 'Sawara', - 'state' => 'Fukuoka', - 'zip' => '814-0002', - 'country' => Country::find('JP'), - 'phone' => '+819064201305', - ]); - case 2: - return new self([ - 'first_name' => 'osu!store', - 'last_name' => '', - 'street' => 'Nishi-Ooi 4-21-3 Birdie House A', - 'city' => 'Shinagawa', - 'state' => 'Tokyo', - 'zip' => '140-0015', - 'country' => Country::find('JP'), - 'phone' => '+818013811430', - ]); - } + return new static([ + 'first_name' => 'osu!store', + ]); } } diff --git a/resources/views/store/checkout/show.blade.php b/resources/views/store/checkout/show.blade.php index fa7069ff36e..c077369aea6 100644 --- a/resources/views/store/checkout/show.blade.php +++ b/resources/views/store/checkout/show.blade.php @@ -72,8 +72,6 @@ @endforeach @endif - - @include('store.objects.new_address') @endif diff --git a/resources/views/store/objects/address.blade.php b/resources/views/store/objects/address.blade.php index 11d7e3e3859..4c93df95b97 100644 --- a/resources/views/store/objects/address.blade.php +++ b/resources/views/store/objects/address.blade.php @@ -24,27 +24,11 @@ $mainClasses .= ' clickable-row'; } @endphp -{!! Form::open([ - 'action' => 'StoreController@postUpdateAddress', - 'class' => $mainClasses, - 'data-remote' => true, - 'id' => "address-{$data->address_id}", -]) !!} + +
{{ $data->first_name }} {{ $data->last_name }}
{{ $data->street }}
-
{{ $data->city }}, {{ $data->state }}, {{ $data->zip }}
+
{{ implode(', ', array_filter([$data->city, $data->state, $data->zip])) }}
{{ $data->countryName() }}
{{ $data->phone }}
- - @if ($withButtons) - {!! Form::hidden('id', $data->address_id) !!} - - - - - @endif -{!! Form::close() !!} +
diff --git a/resources/views/store/objects/new_address.blade.php b/resources/views/store/objects/new_address.blade.php deleted file mode 100644 index ee333754ead..00000000000 --- a/resources/views/store/objects/new_address.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -{{-- - Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. - See the LICENCE file in the repository root for full licence text. ---}} -@php - $showForm = count($addresses) === 0; -@endphp -{!! Form::open(['action' => 'StoreController@postNewAddress', "data-remote" => true]) !!} -
-
-
-

Adding new shipping address

-
- -
- {!! Form::label('address[first_name]', 'First Name', ["class" => "sr-only"]) !!} - {!! Form::text("address[first_name]", null, ['class' => 'form-control', "placeholder" => "First Name"]) !!} -
-
- {!! Form::label('address[last_name]', 'Last Name', ["class" => "sr-only"]) !!} - {!! Form::text("address[last_name]", null, ['class' => 'form-control', "placeholder" => "Last Name"]) !!} -
-
- {!! Form::label('address[street]', 'Street Number, Name, Building, etc', ["class" => "sr-only"]) !!} - {!! Form::text("address[street]", null, ['class' => 'form-control', "placeholder" => "Street Number, Name, Building, etc"]) !!} -
-
- {!! Form::label('address[city]', 'City', ["class" => "sr-only"]) !!} - {!! Form::text("address[city]", null, ['class' => 'form-control', "placeholder" => "City"]) !!} -
-
- {!! Form::label('address[state]', 'State', ["class" => "sr-only"]) !!} - {!! Form::text("address[state]", null, ['class' => 'form-control', "placeholder" => "State"]) !!} -
-
- {!! Form::label('address[zip]', 'Post Code', ["class" => "sr-only"]) !!} - {!! Form::text("address[zip]", null, ['class' => 'form-control', "placeholder" => "Post Code"]) !!} -
-
- {!! Form::label('address[country_code]', 'Country', ["class" => "sr-only"]) !!} - {!!Form::select('address[country_code]', countries_array_for_select(), request_country(), ['class' => 'form-control']) !!} -
-
- {!! Form::label('address[phone]', 'Phone Number', ["class" => "sr-only"]) !!} - {!! Form::text("address[phone]", null, ['class' => 'form-control', "placeholder" => "Phone Number"]) !!} -
-
-
- -
- - @if (!$showForm) - Add new shipping address - @endif -
-{!! Form::close() !!} diff --git a/routes/web.php b/routes/web.php index ee02e21cd03..cbe2f921739 100644 --- a/routes/web.php +++ b/routes/web.php @@ -325,9 +325,6 @@ Route::get('listing', 'StoreController@getListing')->name('products.index'); Route::get('invoice/{invoice}', 'StoreController@getInvoice')->name('invoice.show'); - Route::post('update-address', 'StoreController@postUpdateAddress'); - Route::post('new-address', 'StoreController@postNewAddress'); - Route::group(['namespace' => 'Store'], function () { Route::post('products/{product}/notification-request', 'NotificationRequestsController@store')->name('notification-request'); Route::delete('products/{product}/notification-request', 'NotificationRequestsController@destroy'); From 4414a17ec6492cc125b47357c8e74b9b1d133331 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 28 Jun 2023 18:22:57 +0900 Subject: [PATCH 02/40] ununsed --- resources/views/store/address-destroy.blade.php | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 resources/views/store/address-destroy.blade.php diff --git a/resources/views/store/address-destroy.blade.php b/resources/views/store/address-destroy.blade.php deleted file mode 100644 index d7ef27522c1..00000000000 --- a/resources/views/store/address-destroy.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -{{-- - Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. - See the LICENCE file in the repository root for full licence text. ---}} -(function() { - var $el = $("#address-{{ $address_id }}") - $el.slideUp(function() { $el.remove() }) -}).call(this) From 9f325811f05509095af70ddb5dab58c6ddafb868 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 28 Jun 2023 18:24:52 +0900 Subject: [PATCH 03/40] remove logic handling shipping addresses --- .../store/_shipping_germany_warning.blade.php | 16 ----------- resources/views/store/checkout/show.blade.php | 28 +------------------ .../views/store/objects/address.blade.php | 22 --------------- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 resources/views/store/_shipping_germany_warning.blade.php diff --git a/resources/views/store/_shipping_germany_warning.blade.php b/resources/views/store/_shipping_germany_warning.blade.php deleted file mode 100644 index d6bed9f1fbe..00000000000 --- a/resources/views/store/_shipping_germany_warning.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -{{-- - Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. - See the LICENCE file in the repository root for full licence text. ---}} - -
-

NOTE TO GERMAN CUSTOMERS

- -

- We have recently been notified of issues regarding deliveries within Germany, possibly due to a change in German customs regulations. Multiple cases have been reported where packages are not delivered to the addressee, but instead to a customs house. The addressee is then sent a notice to pick up the item in person and pay an import sales tax. Unfortunately international customs procedures are out of our control, but please take this into account when placing your order. -

- -

- -

-
diff --git a/resources/views/store/checkout/show.blade.php b/resources/views/store/checkout/show.blade.php index c077369aea6..42840e1bf37 100644 --- a/resources/views/store/checkout/show.blade.php +++ b/resources/views/store/checkout/show.blade.php @@ -49,40 +49,14 @@

total

{{{ currency($order->getTotal()) }}}

- - @if($order->requiresShipping() && !$order->shipping) -

+ shipping fees

- @endif
- @if ($order->requiresShipping()) -
-

Shipping Address

- - @if (count($addresses)) -
- @foreach($addresses as $a) - @include('store.objects.address', [ - 'data' => $a, - 'selected' => (isset($order->address) && $order->address->address_id === $a->address_id), - 'modifiable' => true, - ]) - @endforeach -
- @endif -
- @endif - - @if(!$order->requiresShipping() || $order->shipping) + @if (!$order->requiresShipping() || $order->shipping > 0)

Select Payment Method

- @if ($order->address !== null && $order->address->country_code === 'DE') - @include('store._shipping_germany_warning') - @endif - @if ($hasErrors) {{-- Remove checkout options if there are cart errors --}}
diff --git a/resources/views/store/objects/address.blade.php b/resources/views/store/objects/address.blade.php index 4c93df95b97..8c7eac562ac 100644 --- a/resources/views/store/objects/address.blade.php +++ b/resources/views/store/objects/address.blade.php @@ -2,28 +2,6 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -@php - $modifiable = $modifiable ?? false; - $isCard = isset($selected); - - if ($isCard) { - $modifiers[] = 'card'; - - if ($selected) { - $modifiers[] = 'card-active'; - } else { - $modifiers[] = 'card-hover'; - $withButtons = true; - } - } - - $mainClasses = class_with_modifiers('address', $modifiers ?? []); - $withButtons = $withButtons ?? false; - - if ($withButtons) { - $mainClasses .= ' clickable-row'; - } -@endphp
{{ $data->first_name }} {{ $data->last_name }}
From 5fa41f2613adc252cb93bf375e52ed1d82406510 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 28 Jun 2023 18:58:02 +0900 Subject: [PATCH 04/40] trigger error when trying to checkout a non-shopify item that requires shipping --- app/Libraries/OrderCheckout.php | 16 ++++++--- resources/views/store/checkout/show.blade.php | 34 +++++++++---------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/app/Libraries/OrderCheckout.php b/app/Libraries/OrderCheckout.php index 0f3293badb8..6f93a84d0e5 100644 --- a/app/Libraries/OrderCheckout.php +++ b/app/Libraries/OrderCheckout.php @@ -174,23 +174,29 @@ public function validate() $messages[] = $item->validationErrors()->allMessages(); } + $product = $item->product; + // Checkout process level validations, should not be part of OrderItem validation. - if ($item->product === null || !$item->product->isAvailable()) { + if ($product === null || !$product->isAvailable()) { $messages[] = osu_trans('model_validation/store/product.not_available'); } - if (!$item->product->inStock($item->quantity)) { + if (!$product->inStock($item->quantity)) { $messages[] = osu_trans('model_validation/store/product.insufficient_stock'); } - if ($item->quantity > $item->product->max_quantity) { - $messages[] = osu_trans('model_validation/store/product.too_many', ['count' => $item->product->max_quantity]); + if ($item->quantity > $product->max_quantity) { + $messages[] = osu_trans('model_validation/store/product.too_many', ['count' => $product->max_quantity]); } - if ($shouldShopify && !$item->product->isShopify()) { + if ($shouldShopify && !$product->isShopify()) { $messages[] = osu_trans('model_validation/store/product.must_separate'); } + if ($product->requiresShipping() && !$product->isShopify()) { + $messages[] = osu_trans('model_validation/store/product.not_available'); + } + $customClass = $item->getCustomClassInstance(); if ($customClass !== null) { $messages[] = $customClass->validate()->allMessages(); diff --git a/resources/views/store/checkout/show.blade.php b/resources/views/store/checkout/show.blade.php index 42840e1bf37..d797be2ca6b 100644 --- a/resources/views/store/checkout/show.blade.php +++ b/resources/views/store/checkout/show.blade.php @@ -53,24 +53,22 @@
- @if (!$order->requiresShipping() || $order->shipping > 0) -
-

Select Payment Method

+
+

Select Payment Method

- @if ($hasErrors) - {{-- Remove checkout options if there are cart errors --}} -
-

{{ osu_trans('store.checkout.cart_problems') }}

-

- {{ osu_trans('store.checkout.cart_problems_edit') }} -

-
- @else - @foreach ($checkout->allowedCheckoutProviders() as $provider) - @include("store.checkout._{$provider}") - @endforeach - @endif -
- @endif + @if ($hasErrors) + {{-- Remove checkout options if there are cart errors --}} +
+

{{ osu_trans('store.checkout.cart_problems') }}

+

+ {{ osu_trans('store.checkout.cart_problems_edit') }} +

+
+ @else + @foreach ($checkout->allowedCheckoutProviders() as $provider) + @include("store.checkout._{$provider}") + @endforeach + @endif +
@endsection From df171eda8aa107d6b5c563e53315c92bf1234f47 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 28 Jun 2023 19:07:05 +0900 Subject: [PATCH 05/40] no longer used --- resources/css/bem-index.less | 1 - resources/css/bem/address-list.less | 12 -------- resources/css/bem/address.less | 43 ----------------------------- 3 files changed, 56 deletions(-) delete mode 100644 resources/css/bem/address-list.less diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less index 3a4014018ba..918f9d66ce1 100644 --- a/resources/css/bem-index.less +++ b/resources/css/bem-index.less @@ -6,7 +6,6 @@ @import "bem/account-edit-status"; @import "bem/account-verification-message"; @import "bem/address"; -@import "bem/address-list"; @import "bem/admin-contest"; @import "bem/admin-contest-entry"; @import "bem/admin-menu"; diff --git a/resources/css/bem/address-list.less b/resources/css/bem/address-list.less deleted file mode 100644 index 71478b859c0..00000000000 --- a/resources/css/bem/address-list.less +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -.address-list { - margin: 20px 0; - display: grid; - grid-gap: 20px; - - @media @desktop { - grid-template-columns: 1fr 1fr; - } -} diff --git a/resources/css/bem/address.less b/resources/css/bem/address.less index 0ec682959af..11a71601396 100644 --- a/resources/css/bem/address.less +++ b/resources/css/bem/address.less @@ -3,47 +3,4 @@ .address { margin-bottom: 20px; - - &--card { - .default-box-shadow(); - .default-border-radius(); - background: @osu-colour-b4; - padding: 20px; - margin: 0; - } - - &--card-active { - .default-box-shadow(); - box-shadow: 0 0 0 3px @osu-colour-l4; - } - - &--card-hover { - &:hover { - .default-box-shadow(); - box-shadow: 0 0 0 3px @osu-colour-l4; - } - } - - &__button-delete { - .reset-input(); - color: @osu-colour-c1; - position: absolute; - padding: 10px; - top: 0; - right: 0; - font-size: 20px; // icon size - - &:hover { - color: @osu-colour-red-2; - } - } - - &__button-select { - position: absolute; - top: 0; - left: 0; - width: 1px; - height: 1px; - opacity: 0; - } } From 8e17fe64c2f9cf405e2829ecc39bc7434890fe47 Mon Sep 17 00:00:00 2001 From: Liam DeVoe Date: Wed, 28 Jun 2023 21:31:15 -0400 Subject: [PATCH 06/40] mark UserCompact.default_group as nullable --- resources/views/docs/_structures/user_compact.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/docs/_structures/user_compact.md b/resources/views/docs/_structures/user_compact.md index c48ec7b5233..aeffcca5e2e 100644 --- a/resources/views/docs/_structures/user_compact.md +++ b/resources/views/docs/_structures/user_compact.md @@ -20,7 +20,7 @@ Field | Type | Description --------------- | ------------------------- | ---------------------------------------------------------------------- avatar_url | string | url of user's avatar country_code | string | two-letter code representing user's country -default_group | string | Identifier of the default [Group](#group) the user belongs to. +default_group | string? | Identifier of the default [Group](#group) the user belongs to. id | number | unique identifier for user is_active | boolean | has this account been active in the last x months? is_bot | boolean | is this a bot account? From 444590655368952eb5e916b7cde921b6c6b61448 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 28 Jun 2023 19:15:12 +0900 Subject: [PATCH 07/40] just hard code osu!store text --- resources/views/store/orders/_details.blade.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index 1b744385276..d93c8c5309b 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -37,7 +37,9 @@

Sent Via:

- @include('store.objects.address', ['data' => $sentViaAddress, 'grid' => '']) +
+ osu!store +
@@ -46,7 +48,7 @@

Shipping To:

- @include('store.objects.address', ['data' => $order->address, 'grid' => '']) + @include('store.objects.address', ['data' => $order->address])
@endif @@ -77,7 +79,7 @@ $showTrackingCode = ($order->isShipped() || $order->isDelivered() || Auth::user()->isAdmin()) && $order->tracking_code; $transactionDetails = [ - 'Salesperson' => "{$sentViaAddress->first_name} {$sentViaAddress->last_name}", + 'Salesperson' => 'osu!store', 'Order #' => "#{$order->order_id}", 'Shipping Method' => $showTrackingCode ? 'EMS ('.trim($order->tracking_code).')' : 'N/A', 'Shipping Terms' => 'FOB Japan', From dc18ef8db013868b71b82305702ae81019ac11cc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 29 Jun 2023 15:25:29 +0900 Subject: [PATCH 08/40] Add clockworkd enable flag to example `.env` file --- .env.example | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.env.example b/.env.example index 246c9d9a484..52cb488c082 100644 --- a/.env.example +++ b/.env.example @@ -13,6 +13,10 @@ APP_LOG_LEVEL=debug # DOCS_URL= +# clockwork provides local development insights (at /__clockwork/) +# adds a slight performance overhead. +CLOCKWORK_ENABLE=true + DB_HOST=localhost DB_DATABASE=osu DB_USERNAME=osuweb From 6847bf750286ef1e740fecb135e64b51cd3c95c0 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Thu, 29 Jun 2023 17:15:41 +0900 Subject: [PATCH 09/40] update tests for new rules --- database/factories/Store/ProductFactory.php | 10 ++++++++++ tests/Libraries/OrderCheckoutTest.php | 22 ++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/database/factories/Store/ProductFactory.php b/database/factories/Store/ProductFactory.php index cece4411d43..654f18dc9c0 100644 --- a/database/factories/Store/ProductFactory.php +++ b/database/factories/Store/ProductFactory.php @@ -96,4 +96,14 @@ public function masterTshirt(): static 'weight' => 100, ]); } + + public function virtual(): static + { + return $this->state([ + 'base_shipping' => 0.00, + 'next_shipping' => 0.00, + 'weight' => null, + ]); + } + } diff --git a/tests/Libraries/OrderCheckoutTest.php b/tests/Libraries/OrderCheckoutTest.php index e50ca04800d..f33d1ce62f3 100644 --- a/tests/Libraries/OrderCheckoutTest.php +++ b/tests/Libraries/OrderCheckoutTest.php @@ -69,10 +69,30 @@ public function testTournamentBannerWhenNotAvailable() $this->assertNotEmpty($checkout->validate()); } + public function testShippableItemRequiresShopify() + { + $product = Product::factory()->create(['stock' => 5, 'max_quantity' => 5, 'shopify_id' => null]); + $orderItem = OrderItem::factory()->create([ + 'product_id' => $product, + 'quantity' => 1, + ]); + + $order = Order::factory()->create(); + $order->items()->save($orderItem); + + $checkout = new OrderCheckout($order); + $result = $checkout->validate(); + + $this->assertSame( + [osu_trans('model_validation/store/product.not_available')], + array_get($result, "orderItems.{$orderItem->getKey()}") + ); + } + public function testShopifyItemDoesNotMix() { $product1 = Product::factory()->create(['stock' => 5, 'max_quantity' => 5, 'shopify_id' => 1]); - $product2 = Product::factory()->create(['stock' => 5, 'max_quantity' => 5, 'shopify_id' => null]); + $product2 = Product::factory()->virtual()->create(['stock' => 5, 'max_quantity' => 5, 'shopify_id' => null]); $orderItem1 = OrderItem::factory()->create([ 'product_id' => $product1, 'quantity' => 1, From 99a4fcd72a50cd35f15e66ec1d9bf2f253d075b3 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Thu, 29 Jun 2023 17:31:49 +0900 Subject: [PATCH 10/40] lint --- app/Http/Controllers/StoreController.php | 1 - app/Models/Store/Address.php | 1 - database/factories/Store/ProductFactory.php | 1 - 3 files changed, 3 deletions(-) diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index c94ca481095..3eb0ef604be 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -9,7 +9,6 @@ use App\Models\Store; use Auth; use Request; -use Validator; class StoreController extends Controller { diff --git a/app/Models/Store/Address.php b/app/Models/Store/Address.php index 595ad6a08eb..d9d2ff8c5cb 100644 --- a/app/Models/Store/Address.php +++ b/app/Models/Store/Address.php @@ -7,7 +7,6 @@ use App\Models\Country; use App\Models\User; -use Auth; /** * @property int $address_id diff --git a/database/factories/Store/ProductFactory.php b/database/factories/Store/ProductFactory.php index 654f18dc9c0..439f543d111 100644 --- a/database/factories/Store/ProductFactory.php +++ b/database/factories/Store/ProductFactory.php @@ -105,5 +105,4 @@ public function virtual(): static 'weight' => null, ]); } - } From a4ebb2e3a972e970a08ec40349af5bbbe0def3da Mon Sep 17 00:00:00 2001 From: bakaneko Date: Thu, 29 Jun 2023 17:48:52 +0900 Subject: [PATCH 11/40] unneeded --- app/Http/Controllers/StoreController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index 3eb0ef604be..82e313cd1f6 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -52,11 +52,10 @@ public function getInvoice($id = null) abort(403); } - $sentViaAddress = Store\Address::sender(); $forShipping = Auth::user()->isAdmin() && get_bool(Request::input('for_shipping')); $copies = clamp(get_int(request('copies')), 1, config('store.invoice.max_copies')); - return ext_view('store.invoice', compact('order', 'forShipping', 'copies', 'sentViaAddress')); + return ext_view('store.invoice', compact('order', 'forShipping', 'copies')); } public function missingMethod($parameters = []) From 4946190839d1f48ba1c6e64c2e2a41f63a8f6e85 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Thu, 29 Jun 2023 17:49:14 +0900 Subject: [PATCH 12/40] ??? --- app/Http/Controllers/StoreController.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index 82e313cd1f6..adc76cca510 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -57,9 +57,4 @@ public function getInvoice($id = null) return ext_view('store.invoice', compact('order', 'forShipping', 'copies')); } - - public function missingMethod($parameters = []) - { - abort(404); - } } From 06263ff02623b9b5bbe8068028383f1662e4969c Mon Sep 17 00:00:00 2001 From: bakaneko Date: Thu, 29 Jun 2023 19:10:29 +0900 Subject: [PATCH 13/40] ...why is that even grid --- resources/views/store/invoice.blade.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/views/store/invoice.blade.php b/resources/views/store/invoice.blade.php index f5b0b821ae3..caf66143b81 100644 --- a/resources/views/store/invoice.blade.php +++ b/resources/views/store/invoice.blade.php @@ -9,13 +9,11 @@
@if (Request::has('thanks')) -
-
-

Thanks for your order!

-

- You will receive a confirmation email soon. If you have any enquiries, please contact us! -

-
+
+

Thanks for your order!

+

+ You will receive a confirmation email soon. If you have any enquiries, please contact us! +

@endif From d6565f3298122f1ef4a7c0950883494e7e2832bf Mon Sep 17 00:00:00 2001 From: bakaneko Date: Thu, 29 Jun 2023 21:22:56 +0900 Subject: [PATCH 14/40] removing fake grid --- resources/css/bem/address.less | 1 + resources/css/bem/store-page.less | 14 ++ .../views/store/orders/_details.blade.php | 147 ++++++++---------- 3 files changed, 82 insertions(+), 80 deletions(-) diff --git a/resources/css/bem/address.less b/resources/css/bem/address.less index 11a71601396..ee7f23c3281 100644 --- a/resources/css/bem/address.less +++ b/resources/css/bem/address.less @@ -3,4 +3,5 @@ .address { margin-bottom: 20px; + overflow-wrap: break-word; } diff --git a/resources/css/bem/store-page.less b/resources/css/bem/store-page.less index bb37c2f2f4a..31dbc67dd57 100644 --- a/resources/css/bem/store-page.less +++ b/resources/css/bem/store-page.less @@ -15,6 +15,15 @@ background-color: @osu-colour-b4; } + &__address { + @media @desktop { + display: grid; + grid-auto-columns: minmax(0, 1fr); + grid-auto-flow: column; + gap: 33%; + } + } + &__option { text-transform: inherit; margin: 0; @@ -34,4 +43,9 @@ margin-bottom: 20px; } } + + &__invoice-header { + display: flex; + gap: 10px; + } } diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index d93c8c5309b..ab96a71e9d4 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -2,100 +2,87 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -
-
-
-
-
-

Invoice

-
-
- Date: - @if($order->shipped_at) - {{ $order->shipped_at->toDateString() }} - @elseif($order->paid_at) - {{ $order->paid_at->toDateString() }} - @else - {{ $order->updated_at->toDateString() }} - @endif -
-
-
-

- ppy Pty Ltd
- ACN 163 593 413 a.t.f. Dean Herbert Family Trust -

- -

contact: pe@ppy.sh / +81 80 1381 1430

+
+
+
+

Invoice

+
+ Date: + @if($order->shipped_at) + {{ $order->shipped_at->toDateString() }} + @elseif($order->paid_at) + {{ $order->paid_at->toDateString() }} + @else + {{ $order->updated_at->toDateString() }} + @endif
+
+

+ ppy Pty Ltd
+ ACN 163 593 413 a.t.f. Dean Herbert Family Trust +

-
+

contact: pe@ppy.sh / +81 80 1381 1430

+
+
- @if($order->address !== null) -
-
-

Sent Via:

+
-
- osu!store -
-
+ @if($order->address !== null) +
+
+

Sent Via:

-
-
- -
-

Shipping To:

- - @include('store.objects.address', ['data' => $order->address]) +
+ osu!store
- @endif - -
-
-

Order Details

-
-
-
-
- @include('store.objects.order', [ - 'order' => $order, - 'weight' => true, - 'checkout' => false, - 'forShipping' => $forShipping, - ]) +
+

Shipping To:

- @if ($order->isHideSupporterFromActivity()) - {{ osu_trans('store.invoice.hide_from_activity') }} - @endif + @include('store.objects.address', ['data' => $order->address])
+ @endif + +
+

Order Details

- @if ($order->address !== null) - @php - $showTrackingCode = ($order->isShipped() || $order->isDelivered() || Auth::user()->isAdmin()) && $order->tracking_code; + @include('store.objects.order', [ + 'order' => $order, + 'weight' => true, + 'checkout' => false, + 'forShipping' => $forShipping, + ]) - $transactionDetails = [ - 'Salesperson' => 'osu!store', - 'Order #' => "#{$order->order_id}", - 'Shipping Method' => $showTrackingCode ? 'EMS ('.trim($order->tracking_code).')' : 'N/A', - 'Shipping Terms' => 'FOB Japan', - 'Payment Terms' => studly_case($order->getPaymentProvider()).' ('.$order->getPaymentStatusText().')', - ]; - @endphp -
- @foreach ($transactionDetails as $key => $value) -
- {{ $key }} -
-
- {{ $value }} -
- @endforeach -
+ @if ($order->isHideSupporterFromActivity()) + {{ osu_trans('store.invoice.hide_from_activity') }} @endif
+ + @if ($order->address !== null) + @php + $showTrackingCode = ($order->isShipped() || $order->isDelivered() || Auth::user()->isAdmin()) && $order->tracking_code; + + $transactionDetails = [ + 'Salesperson' => 'osu!store', + 'Order #' => "#{$order->order_id}", + 'Shipping Method' => $showTrackingCode ? 'EMS ('.trim($order->tracking_code).')' : 'N/A', + 'Shipping Terms' => 'FOB Japan', + 'Payment Terms' => studly_case($order->getPaymentProvider()).' ('.$order->getPaymentStatusText().')', + ]; + @endphp +
+ @foreach ($transactionDetails as $key => $value) +
+ {{ $key }} +
+
+ {{ $value }} +
+ @endforeach +
+ @endif
From 488c4368c69177a7a2e4c4bf94901dc4faf3ce12 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 30 Jun 2023 16:45:53 +0900 Subject: [PATCH 15/40] Only stick beatmap discussion timestamp on the discussion page --- resources/css/bem/beatmap-discussion-timestamp.less | 13 +++++++------ resources/js/beatmap-discussions/discussion.tsx | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/css/bem/beatmap-discussion-timestamp.less b/resources/css/bem/beatmap-discussion-timestamp.less index 683abcd82e1..f1d7a25d912 100644 --- a/resources/css/bem/beatmap-discussion-timestamp.less +++ b/resources/css/bem/beatmap-discussion-timestamp.less @@ -11,14 +11,15 @@ // avatar + paddings + margins height: (@beatmap-discussion--avatar-size + 20px + 10px); - align-items: center; - display: flex; - position: sticky; - // 36px is page-extra-tabs height on desktop. - // This doesn't work when the new discussion box is visible. - top: calc(var(--navbar-height) + 36px); + + &--sticky { + position: sticky; + // 36px is page-extra-tabs height on desktop. + // This doesn't work when the new discussion box is visible. + top: calc(var(--navbar-height) + 36px); + } &__icons { display: flex; diff --git a/resources/js/beatmap-discussions/discussion.tsx b/resources/js/beatmap-discussions/discussion.tsx index 06a17b49d19..2b4c6d305c4 100644 --- a/resources/js/beatmap-discussions/discussion.tsx +++ b/resources/js/beatmap-discussions/discussion.tsx @@ -290,7 +290,7 @@ export class Discussion extends React.Component { private renderTimestamp() { return ( -
+
{this.props.discussion.timestamp != null && this.props.isTimelineVisible &&
}
From 71db2a359983dce0a589001c02209edb3b921beb Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 17:13:41 +0900 Subject: [PATCH 16/40] don't need the extra funny grids if actual grid --- resources/css/bem/store-page.less | 9 ++++ resources/views/store/products/show.blade.php | 47 +++++-------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/resources/css/bem/store-page.less b/resources/css/bem/store-page.less index 31dbc67dd57..a7b6a525b63 100644 --- a/resources/css/bem/store-page.less +++ b/resources/css/bem/store-page.less @@ -48,4 +48,13 @@ display: flex; gap: 10px; } + + &__product { + @media @desktop { + display: grid; + grid-auto-columns: minmax(0, 1fr); + grid-auto-flow: column; + gap: 40px; + } + } } diff --git a/resources/views/store/products/show.blade.php b/resources/views/store/products/show.blade.php index 6a5cdb05e75..3c28984b5a8 100644 --- a/resources/views/store/products/show.blade.php +++ b/resources/views/store/products/show.blade.php @@ -19,18 +19,11 @@

{{ $product->name }}

@if($product->custom_class && View::exists("store.products.{$product->custom_class}")) - -
-
- {!! markdown($product->description, 'store') !!} -
-
- + {!! markdown($product->description, 'store') !!} @include("store.products.{$product->custom_class}") - @else -
-
+
+
@foreach($product->images() as $i => $image) @@ -62,20 +55,13 @@ class=" @endforeach
-
-
-
- {!! markdown($product->description, 'store') !!} -
-
-
-
-

{{ currency($product->cost) }}

- @if($product->requiresShipping()) -

excluding shipping fees

- @endif -
-
+
+ {!! markdown($product->description, 'store') !!} + +

{{ currency($product->cost) }}

+ @if($product->requiresShipping()) +

excluding shipping fees

+ @endif @if($product->types()) @foreach($product->types() as $type => $values) @@ -120,17 +106,10 @@ class=" ) !!}
- @elseif($product->inStock(1, true)) -
-
- {{ osu_trans('store.product.stock.out_with_alternative') }} -
-
+ @elseif ($product->inStock(1, true)) + {{ osu_trans('store.product.stock.out_with_alternative') }} @else -
-
- {{ osu_trans('store.product.stock.out') }} -
+ {{ osu_trans('store.product.stock.out') }}
@endif
From 3228b8ee22bf82c06d7ee61df4750a7a9ab5abbf Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 17:15:37 +0900 Subject: [PATCH 17/40] indent --- resources/views/store/products/show.blade.php | 162 +++++++++--------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/resources/views/store/products/show.blade.php b/resources/views/store/products/show.blade.php index 3c28984b5a8..a88520eb622 100644 --- a/resources/views/store/products/show.blade.php +++ b/resources/views/store/products/show.blade.php @@ -22,98 +22,98 @@ {!! markdown($product->description, 'store') !!} @include("store.products.{$product->custom_class}") @else -
-
-
- @foreach($product->images() as $i => $image) - - - @endforeach -
-
- @foreach($product->images() as $i => $image) - - @endforeach +
+
+
+ @foreach($product->images() as $i => $image) + + + @endforeach +
+
+ @foreach($product->images() as $i => $image) + + @endforeach +
-
-
- {!! markdown($product->description, 'store') !!} +
+ {!! markdown($product->description, 'store') !!} -

{{ currency($product->cost) }}

- @if($product->requiresShipping()) -

excluding shipping fees

- @endif +

{{ currency($product->cost) }}

+ @if($product->requiresShipping()) +

excluding shipping fees

+ @endif - @if($product->types()) - @foreach($product->types() as $type => $values) - @if (count($values) === 1) - {{-- magic property --}} - - @else -
- + @if($product->types()) + @foreach($product->types() as $type => $values) + @if (count($values) === 1) + {{-- magic property --}} + + @else +
+ -
- +
+ +
-
- @endif - @endforeach - @endif - - @if($product->inStock()) -
- - {!! Form::label( - 'item[quantity]', - osu_trans('store.order.item.quantity'), - ['class' => 'u-uppercase'] - ) !!} + @endif + @endforeach + @endif -
- {!! Form::select( - "item[quantity]", - product_quantity_options($product), 1, - ['class' => 'js-store-item-quantity form-select__input'] + @if($product->inStock()) +
+ + {!! Form::label( + 'item[quantity]', + osu_trans('store.order.item.quantity'), + ['class' => 'u-uppercase'] ) !!} + +
+ {!! Form::select( + "item[quantity]", + product_quantity_options($product), 1, + ['class' => 'js-store-item-quantity form-select__input'] + ) !!} +
+ @elseif ($product->inStock(1, true)) + {{ osu_trans('store.product.stock.out_with_alternative') }} + @else + {{ osu_trans('store.product.stock.out') }}
- @elseif ($product->inStock(1, true)) - {{ osu_trans('store.product.stock.out_with_alternative') }} - @else - {{ osu_trans('store.product.stock.out') }} + @endif
- @endif
-
@endif
From 53d180a7702ded9218d93cc41ffaec8a7ff6c51b Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 17:16:38 +0900 Subject: [PATCH 18/40] use blade directive --- resources/views/store/products/show.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/store/products/show.blade.php b/resources/views/store/products/show.blade.php index a88520eb622..a8a6a57fc65 100644 --- a/resources/views/store/products/show.blade.php +++ b/resources/views/store/products/show.blade.php @@ -26,7 +26,9 @@
@foreach($product->images() as $i => $image) - + @php + $imageSize = fast_imagesize($image[1]); + @endphp Date: Fri, 30 Jun 2023 17:46:32 +0900 Subject: [PATCH 19/40] remove fake grid from supporter-tag blade --- resources/css/bem/store-slider.less | 2 ++ resources/views/store/products/supporter-tag.blade.php | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/resources/css/bem/store-slider.less b/resources/css/bem/store-slider.less index bbc011e4982..dc34e2e75d2 100644 --- a/resources/css/bem/store-slider.less +++ b/resources/css/bem/store-slider.less @@ -91,7 +91,9 @@ } &__presets { + display: flex; align-items: center; + justify-content: flex-end; font-size: @preset-font-size; } diff --git a/resources/views/store/products/supporter-tag.blade.php b/resources/views/store/products/supporter-tag.blade.php index 0c279bf47e5..0c05ef0fc35 100644 --- a/resources/views/store/products/supporter-tag.blade.php +++ b/resources/views/store/products/supporter-tag.blade.php @@ -7,11 +7,7 @@ @endphp @if(!Auth::user()) -
-
- {!! require_login('store.supporter_tag.require_login._', 'store.supporter_tag.require_login.link_text') !!} -
-
+ {!! require_login('store.supporter_tag.require_login._', 'store.supporter_tag.require_login.link_text') !!} @else
@@ -61,7 +57,7 @@
-
+
{{ osu_trans('supporter_tag.months') }} @foreach([1, 2, 4, 6, 12, 18, 24] as $months)
{{$months}}
From ab9251fcb84038d7b932724adf2f29d8e914c7f2 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 18:28:40 +0900 Subject: [PATCH 20/40] that grid kind of did nothing useful (doesn't limit length on mobile, not needed on desktop) --- resources/views/store/products/username-change.blade.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/views/store/products/username-change.blade.php b/resources/views/store/products/username-change.blade.php index 42b78f56e00..032979243e2 100644 --- a/resources/views/store/products/username-change.blade.php +++ b/resources/views/store/products/username-change.blade.php @@ -3,11 +3,7 @@ See the LICENCE file in the repository root for full licence text. --}} @if(!Auth::user()) -
-
- {!! require_login('store.username_change.require_login._', 'store.username_change.require_login.link_text') !!} -
-
+ {!! require_login('store.username_change.require_login._', 'store.username_change.require_login.link_text') !!} @else
From 0eae7ebf8f265ccaeb0b86adf410f476a60f47f5 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 19:55:26 +0900 Subject: [PATCH 21/40] stop using fake grid --- resources/css/bem-index.less | 1 + resources/css/bem/username-change.less | 10 ++++++++++ .../views/store/products/username-change.blade.php | 10 ++++------ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 resources/css/bem/username-change.less diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less index 918f9d66ce1..cd04e32230c 100644 --- a/resources/css/bem-index.less +++ b/resources/css/bem-index.less @@ -389,6 +389,7 @@ @import "bem/user-session-list-session"; @import "bem/user-verification"; @import "bem/user-verification-popup"; +@import "bem/username-change"; @import "bem/value-display"; @import "bem/warning-box"; @import "bem/wiki-main-page"; diff --git a/resources/css/bem/username-change.less b/resources/css/bem/username-change.less new file mode 100644 index 00000000000..4504273187d --- /dev/null +++ b/resources/css/bem/username-change.less @@ -0,0 +1,10 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +.username-change { + @media @desktop { + display: grid; + gap: 40px; + grid-template-columns: auto repeat(2, minmax(0, 1fr)); + } +} diff --git a/resources/views/store/products/username-change.blade.php b/resources/views/store/products/username-change.blade.php index 032979243e2..ee948af28b0 100644 --- a/resources/views/store/products/username-change.blade.php +++ b/resources/views/store/products/username-change.blade.php @@ -5,11 +5,11 @@ @if(!Auth::user()) {!! require_login('store.username_change.require_login._', 'store.username_change.require_login.link_text') !!} @else -
-
+
+
-
+
@@ -27,8 +27,6 @@
Your current username is "{{ Auth::user()->username }}".
-
-

-
+

@endif From 955c1a99478a4bac79d934eb8da10128a4595558 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 19:55:53 +0900 Subject: [PATCH 22/40] remove grid.less --- resources/css/bem-index.less | 1 - resources/css/bem/grid.less | 44 ------------------------------------ 2 files changed, 45 deletions(-) delete mode 100644 resources/css/bem/grid.less diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less index cd04e32230c..20381f1992f 100644 --- a/resources/css/bem-index.less +++ b/resources/css/bem-index.less @@ -177,7 +177,6 @@ @import "bem/gallery-thumbnails"; @import "bem/game-mode"; @import "bem/game-mode-link"; -@import "bem/grid"; @import "bem/grid-cell"; @import "bem/grid-items"; @import "bem/header-buttons"; diff --git a/resources/css/bem/grid.less b/resources/css/bem/grid.less deleted file mode 100644 index 06f2d5e770a..00000000000 --- a/resources/css/bem/grid.less +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -.grid { - // 840px seems a big large for this to trigger? - @media @desktop { - display: flex; - flex-wrap: wrap; - } - - &--stack { - flex-direction: column; - // stack shouldn't devolve into block when shrunk. - @media @mobile { - display: flex; - flex-wrap: wrap; - } - } - - &--centered { - align-items: center; - } - - &--gutters { - @media @desktop { - margin-left: -@flex-grid--gutter-width; - margin-right: -@flex-grid--gutter-width; - } - } - - &--packed { - justify-content: center; - } - - &--right { - justify-content: flex-end; - } - - // Use this if we don't want the grid to collapse into a stack. - // FIXME: better name - &--xs { - display: flex; - } -} From 04a2775e037d63f057c1d24aeb5c678f49877e76 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 20:07:37 +0900 Subject: [PATCH 23/40] doesn't do anything anymore --- .../store/products/supporter-tag.blade.php | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/resources/views/store/products/supporter-tag.blade.php b/resources/views/store/products/supporter-tag.blade.php index 0c05ef0fc35..3a1d55b11a9 100644 --- a/resources/views/store/products/supporter-tag.blade.php +++ b/resources/views/store/products/supporter-tag.blade.php @@ -16,21 +16,19 @@
-
- {!! - Form::text( - 'item[extra_data][username]', - get_string(request('target')), - [ - 'id' => 'username', - 'class' => 'js-username-input store-supporter-tag__input', - 'placeholder' => osu_trans('store.supporter_tag.gift'), - 'autocomplete' => 'off' - ] - ) - !!} -
-
+ {!! + Form::text( + 'item[extra_data][username]', + get_string(request('target')), + [ + 'id' => 'username', + 'class' => 'js-username-input store-supporter-tag__input', + 'placeholder' => osu_trans('store.supporter_tag.gift'), + 'autocomplete' => 'off' + ] + ) + !!} +
{!! Form::textarea( 'item[extra_data][message]', From 5a26906524fcaad3d288618a0e92fe39c44fb429 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 20:18:06 +0900 Subject: [PATCH 24/40] more grid-cell, allow narrower address grid --- resources/css/bem/store-page.less | 5 +++-- resources/views/store/orders/_details.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/css/bem/store-page.less b/resources/css/bem/store-page.less index a7b6a525b63..38c427c66c4 100644 --- a/resources/css/bem/store-page.less +++ b/resources/css/bem/store-page.less @@ -16,11 +16,11 @@ } &__address { - @media @desktop { + @media @narrow-up { display: grid; grid-auto-columns: minmax(0, 1fr); grid-auto-flow: column; - gap: 33%; + gap: 33%; // preserve the weird 3 "column" appearance } } @@ -47,6 +47,7 @@ &__invoice-header { display: flex; gap: 10px; + justify-content: space-between; } &__product { diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index ab96a71e9d4..9b8d5252a85 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -4,7 +4,7 @@ --}}
-
+

Invoice

Date: @@ -17,7 +17,7 @@ @endif
-
+

ppy Pty Ltd
ACN 163 593 413 a.t.f. Dean Herbert Family Trust From 6909806b7bc705c79a62c6b3433ed22263f8e7a4 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 20:18:50 +0900 Subject: [PATCH 25/40] remove grid-cell --- resources/css/bem-index.less | 1 - resources/css/bem/grid-cell.less | 53 -------------------------------- 2 files changed, 54 deletions(-) delete mode 100644 resources/css/bem/grid-cell.less diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less index 20381f1992f..71b4044667c 100644 --- a/resources/css/bem-index.less +++ b/resources/css/bem-index.less @@ -177,7 +177,6 @@ @import "bem/gallery-thumbnails"; @import "bem/game-mode"; @import "bem/game-mode-link"; -@import "bem/grid-cell"; @import "bem/grid-items"; @import "bem/header-buttons"; @import "bem/header-nav-mobile"; diff --git a/resources/css/bem/grid-cell.less b/resources/css/bem/grid-cell.less deleted file mode 100644 index 8433995cc0d..00000000000 --- a/resources/css/bem/grid-cell.less +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -.grid-cell { - flex: 1; - - &--1of2 { - flex: 0 0 50%; - } - - &--1of3 { - flex: 0 0 (1 / 3 * 100%); - } - - &--2of3 { - flex: 0 0 (2 / 3 * 100%); - } - - &--5of12 { - flex: 0 0 (5 / 12 * 100%); - } - - &--fill { - flex: 1 0 100%; - } - - &--minimum { - flex: none; - } - - .grid--gutters > & { - @media @desktop { - padding-left: @flex-grid--gutter-width; - padding-right: @flex-grid--gutter-width; - } - } - - .grid--row-gaps > & { - padding-top: @flex-grid--gutter-width; - padding-bottom: @flex-grid--gutter-width; - } - - // grid has gutters between the cells but not at the start or end. - .grid--margin > & + & { - margin-left: 1em; - } - - // squashes the flex content down to the smallest possible - // size to let other cells expand and fill the gap. - &--squash { - flex: 0 1 0%; - } -} From 2c7310e0bdb5e658b96c01c563f386c689ffdabf Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 21:07:40 +0900 Subject: [PATCH 26/40] missing commit --- app/Models/Store/Address.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/Models/Store/Address.php b/app/Models/Store/Address.php index d9d2ff8c5cb..363104a06a2 100644 --- a/app/Models/Store/Address.php +++ b/app/Models/Store/Address.php @@ -54,11 +54,4 @@ public function countryName() return $this->country->name; } } - - public static function sender() - { - return new static([ - 'first_name' => 'osu!store', - ]); - } } From 85f5ec364810ac15484c05e6e31e89783f0dd1b8 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 21:11:05 +0900 Subject: [PATCH 27/40] probably don't need invoice printing either --- app/Http/Controllers/StoreController.php | 3 +-- resources/views/store/invoice.blade.php | 22 +--------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index adc76cca510..c7f57052a5c 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -53,8 +53,7 @@ public function getInvoice($id = null) } $forShipping = Auth::user()->isAdmin() && get_bool(Request::input('for_shipping')); - $copies = clamp(get_int(request('copies')), 1, config('store.invoice.max_copies')); - return ext_view('store.invoice', compact('order', 'forShipping', 'copies')); + return ext_view('store.invoice', compact('order', 'forShipping')); } } diff --git a/resources/views/store/invoice.blade.php b/resources/views/store/invoice.blade.php index f5b0b821ae3..38c88437af6 100644 --- a/resources/views/store/invoice.blade.php +++ b/resources/views/store/invoice.blade.php @@ -19,13 +19,8 @@

@endif - @for ($i = 0; $i < $copies; $i++) - @if ($i > 0) -
- @endif - @include('store.orders._details') - @endfor + @include('store.orders._details') @include('store.orders._status') @@ -35,19 +30,4 @@ @endforeach @endif
- - @if ($copies > 1) - - @endif @endsection From 499d0073e879c8f17b2251dfdb34a33e34137c96 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 21:13:11 +0900 Subject: [PATCH 28/40] remove env option --- config/store.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/store.php b/config/store.php index a64bf6b7808..f23b652b58f 100644 --- a/config/store.php +++ b/config/store.php @@ -2,9 +2,6 @@ return [ 'allow_restricted_users' => get_bool(env('STORE_ALLOW_RESTRICTED_USERS')) ?? false, - 'invoice' => [ - 'max_copies' => get_int(env('STORE_INVOICE_MAX_COPIES')) ?? 10, - ], 'mail' => [ 'donation_thanks' => [ 'sender_address' => env('STORE_THANKS_SENDER_ADDRESS', 'osu@ppy.sh'), From 2378725400570b1a58e7604976e4f0578b68f09c Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 21:16:23 +0900 Subject: [PATCH 29/40] probably don't need forShipping option anymore, either --- app/Http/Controllers/StoreController.php | 4 +- app/Models/Store/Order.php | 6 +- resources/views/store/objects/order.blade.php | 69 +++++++++---------- .../views/store/orders/_details.blade.php | 1 - 4 files changed, 35 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index c7f57052a5c..0a42822eb09 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -52,8 +52,6 @@ public function getInvoice($id = null) abort(403); } - $forShipping = Auth::user()->isAdmin() && get_bool(Request::input('for_shipping')); - - return ext_view('store.invoice', compact('order', 'forShipping')); + return ext_view('store.invoice', compact('order')); } } diff --git a/app/Models/Store/Order.php b/app/Models/Store/Order.php index 915ab61bffc..8662594f1f7 100644 --- a/app/Models/Store/Order.php +++ b/app/Models/Store/Order.php @@ -265,14 +265,10 @@ public function getProviderReference(): ?string return static::splitTransactionId($this->transaction_id)[1] ?? null; } - public function getSubtotal($forShipping = false) + public function getSubtotal() { $total = 0; foreach ($this->items as $i) { - if ($forShipping && !$i->product->requiresShipping()) { - continue; - } - $total += $i->subtotal(); } diff --git a/resources/views/store/objects/order.blade.php b/resources/views/store/objects/order.blade.php index 264b701167a..7795f494a13 100644 --- a/resources/views/store/objects/order.blade.php +++ b/resources/views/store/objects/order.blade.php @@ -6,7 +6,6 @@ $itemErrors = $validationErrors['orderItems'] ?? []; $checkout = $checkout ?? true; - $forShipping = $forShipping ?? false; $modifiers = $modifiers ?? []; $extraClasses = presence($extraClasses ?? null); @@ -14,43 +13,41 @@
    @foreach ($order->items as $i) - @if (!$forShipping || $i->product->requiresShipping()) -
  • -
    - @php - $subtext = $i->getSubtext(); - @endphp -
    {{ $i->getDisplayName(true) }}
    - @if ($subtext !== null) -
    - {{ $subtext }} -
    - @endif - - @if (isset($itemErrors[$i->id])) -
      - @foreach ($itemErrors[$i->id] as $message) -
    • {{ $message }}
      • - @endforeach -
    - @endif - -
    - @if (isset($weight)) -
    - @if ($i->product->weight !== null) - {{ $i->product->weight }}g - @endif +
  • +
    + @php + $subtext = $i->getSubtext(); + @endphp +
    {{ $i->getDisplayName(true) }}
    + @if ($subtext !== null) +
    + {{ $subtext }}
    @endif -
    - {{ osu_trans_choice('common.count.item', $i->quantity) }} -
    -
    - {{ currency($i->subtotal()) }} + + @if (isset($itemErrors[$i->id])) +
      + @foreach ($itemErrors[$i->id] as $message) +
    • {{ $message }}
      • + @endforeach +
    + @endif + +
    + @if (isset($weight)) +
    + @if ($i->product->weight !== null) + {{ $i->product->weight }}g + @endif
    -
    • - @endif + @endif +
    + {{ osu_trans_choice('common.count.item', $i->quantity) }} +
    +
    + {{ currency($i->subtotal()) }} +
    + @endforeach @if ($checkout && $order->shipping > 0) @@ -79,7 +76,7 @@ Total
- {{ currency($order->getSubtotal($forShipping)) }} + {{ currency($order->getSubtotal()) }}
@endif diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index d93c8c5309b..5e46052fe23 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -65,7 +65,6 @@ 'order' => $order, 'weight' => true, 'checkout' => false, - 'forShipping' => $forShipping, ]) @if ($order->isHideSupporterFromActivity()) From 278370e1be18edbc44179c55391f98238a3ce859 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 30 Jun 2023 21:26:05 +0900 Subject: [PATCH 30/40] unused --- app/Http/Controllers/StoreController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index 0a42822eb09..4248f8bd226 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -8,7 +8,6 @@ use App\Http\Controllers\Store\Controller as Controller; use App\Models\Store; use Auth; -use Request; class StoreController extends Controller { From 0633e7932720acf3a5be4d0614863a7a40e53fe3 Mon Sep 17 00:00:00 2001 From: Liam DeVoe Date: Fri, 30 Jun 2023 13:40:35 -0400 Subject: [PATCH 31/40] update default_group nullability in UserJson and User ts --- resources/js/interfaces/user-json.ts | 2 +- resources/js/models/user.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/interfaces/user-json.ts b/resources/js/interfaces/user-json.ts index 0ad145e9b31..d00be2e30db 100644 --- a/resources/js/interfaces/user-json.ts +++ b/resources/js/interfaces/user-json.ts @@ -71,7 +71,7 @@ interface UserJsonAvailableIncludes { interface UserJsonDefaultAttributes { avatar_url: string; country_code: string; // TODO: country object? - default_group: string; + default_group: string | null; id: number; is_active: boolean; is_bot: boolean; diff --git a/resources/js/models/user.ts b/resources/js/models/user.ts index db2ec751f2d..c116782d295 100644 --- a/resources/js/models/user.ts +++ b/resources/js/models/user.ts @@ -67,7 +67,7 @@ export default class User { updateWithJson(json: UserJson) { this.avatarUrl = json.avatar_url; this.countryCode = json.country_code; - this.defaultGroup = json.default_group; + this.defaultGroup = json.default_group ?? ''; this.isActive = json.is_active; this.isBot = json.is_bot; this.isOnline = json.is_online; From 41ffa0a89937c230fa5ec227f252ac16ce9d18e5 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 13:35:25 +0900 Subject: [PATCH 32/40] log metric for type of document being indexed --- app/Jobs/EsDocument.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/Jobs/EsDocument.php b/app/Jobs/EsDocument.php index e0e4284200e..b1859efb401 100644 --- a/app/Jobs/EsDocument.php +++ b/app/Jobs/EsDocument.php @@ -7,6 +7,7 @@ namespace App\Jobs; +use Datadog; use Exception; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; @@ -58,6 +59,7 @@ public function handle(): void if ($model !== null) { $model->esIndexDocument(); + static::incrementStat('index', $this->modelMeta['class']); return; } @@ -66,5 +68,18 @@ public function handle(): void $keyName = $model->getKeyName(); $model->setAttribute($keyName, $id); $model->esDeleteDocument(); + static::incrementStat('delete', get_class($model)); + } + + private static function incrementStat(string $action, string $class) + { + Datadog::increment( + config('datadog-helper.prefix_web').'.es_document', + 1, + [ + 'action' => $action, + 'class' => $class, + ], + ); } } From eecdf329c1f08c1019d901b547b67af6749aa2e0 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 13:45:13 +0900 Subject: [PATCH 33/40] unused --- resources/css/utilities.less | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/css/utilities.less b/resources/css/utilities.less index e4c641be451..663efd8a524 100644 --- a/resources/css/utilities.less +++ b/resources/css/utilities.less @@ -7,12 +7,6 @@ } } -.print-page-break { - @media print { - page-break-before: always; - } -} - .u-blackout-visible { z-index: @z-index--blackout-visible !important; } From 8b2bd37e1a723433c2e0feea278f4b336d239073 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 13:45:49 +0900 Subject: [PATCH 34/40] too many newlines --- resources/views/store/invoice.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/store/invoice.blade.php b/resources/views/store/invoice.blade.php index 38c88437af6..be5aec35ed8 100644 --- a/resources/views/store/invoice.blade.php +++ b/resources/views/store/invoice.blade.php @@ -19,7 +19,6 @@
@endif - @include('store.orders._details') @include('store.orders._status') From 7d4efef30872e1f5ff31e29d4aa74ac460b3f21f Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 3 Jul 2023 15:55:48 +0900 Subject: [PATCH 35/40] Use correct page icon for artist page --- resources/css/bem/header-v4.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/css/bem/header-v4.less b/resources/css/bem/header-v4.less index 345f03ac253..7a656a9b261 100644 --- a/resources/css/bem/header-v4.less +++ b/resources/css/bem/header-v4.less @@ -160,6 +160,10 @@ flex: none; background-size: 75%; + .@{_top}--artist & { + background-image: url('~@images/icons/artists.svg'); + } + .@{_top}--artists & { background-image: url('~@images/icons/artists.svg'); } From 452784d0d699e883090823871d5338021da34da3 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 18:26:51 +0900 Subject: [PATCH 36/40] get_class(null) isn't supposed to work anyway --- app/Jobs/EsDocument.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Jobs/EsDocument.php b/app/Jobs/EsDocument.php index b1859efb401..78a92b45b56 100644 --- a/app/Jobs/EsDocument.php +++ b/app/Jobs/EsDocument.php @@ -59,7 +59,7 @@ public function handle(): void if ($model !== null) { $model->esIndexDocument(); - static::incrementStat('index', $this->modelMeta['class']); + static::incrementStat('index'); return; } @@ -68,17 +68,17 @@ public function handle(): void $keyName = $model->getKeyName(); $model->setAttribute($keyName, $id); $model->esDeleteDocument(); - static::incrementStat('delete', get_class($model)); + static::incrementStat('delete'); } - private static function incrementStat(string $action, string $class) + private function incrementStat(string $action): void { Datadog::increment( config('datadog-helper.prefix_web').'.es_document', 1, [ 'action' => $action, - 'class' => $class, + 'class' => $this->modelMeta['class'], ], ); } From 90c26435f3cb190c2d6ee0a5c383d4d2ab880282 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 18:27:46 +0900 Subject: [PATCH 37/40] this --- app/Jobs/EsDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/EsDocument.php b/app/Jobs/EsDocument.php index 78a92b45b56..141682d56c9 100644 --- a/app/Jobs/EsDocument.php +++ b/app/Jobs/EsDocument.php @@ -59,7 +59,7 @@ public function handle(): void if ($model !== null) { $model->esIndexDocument(); - static::incrementStat('index'); + $this->incrementStat('index'); return; } @@ -68,7 +68,7 @@ public function handle(): void $keyName = $model->getKeyName(); $model->setAttribute($keyName, $id); $model->esDeleteDocument(); - static::incrementStat('delete'); + $this->incrementStat('delete'); } private function incrementStat(string $action): void From 1a9036b4d74ad1e9a06bf3782c6ab725fc9038fe Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 21:53:39 +0900 Subject: [PATCH 38/40] merge fail --- resources/views/store/orders/_details.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index 9b8d5252a85..1352cb9384e 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -54,7 +54,6 @@ 'order' => $order, 'weight' => true, 'checkout' => false, - 'forShipping' => $forShipping, ]) @if ($order->isHideSupporterFromActivity()) From f070ddae3a4e68e5aa4c6378bca389c9e2c8c286 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 22:07:33 +0900 Subject: [PATCH 39/40] leftover from some experiment --- resources/views/store/products/username-change.blade.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/views/store/products/username-change.blade.php b/resources/views/store/products/username-change.blade.php index ee948af28b0..99bb1ad98e6 100644 --- a/resources/views/store/products/username-change.blade.php +++ b/resources/views/store/products/username-change.blade.php @@ -6,9 +6,7 @@ {!! require_login('store.username_change.require_login._', 'store.username_change.require_login.link_text') !!} @else
-
-
-
+
From 18092a841b20a1bdd5969479ab65ef21f909e56f Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 3 Jul 2023 22:14:58 +0900 Subject: [PATCH 40/40] unneeded nested div --- .../store/products/username-change.blade.php | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/resources/views/store/products/username-change.blade.php b/resources/views/store/products/username-change.blade.php index 99bb1ad98e6..10c62bda008 100644 --- a/resources/views/store/products/username-change.blade.php +++ b/resources/views/store/products/username-change.blade.php @@ -8,18 +8,16 @@
-
- - - - {!! Form::label('username', 'New Username') !!} - {!! Form::text('item[extra_info]', '', [ - 'id' => 'username', - 'class' => 'js-username-change-input form-text form-text--username-change', - 'placeholder' => 'Requested Username', - 'autocomplete' => 'off', - ]) !!} -
+ + + + {!! Form::label('username', 'New Username') !!} + {!! Form::text('item[extra_info]', '', [ + 'id' => 'username', + 'class' => 'js-username-change-input form-text form-text--username-change', + 'placeholder' => 'Requested Username', + 'autocomplete' => 'off', + ]) !!}
{{ osu_trans('store.username_change.check') }}