Merge pull request #11156 from notbakaneko/fix/cart-empty-username

Hotfix adding empty username to cart

Author: peppy

app/Models/Store/Order.php

@@ -694,7 +694,7 @@ private function newOrderItem(array $params, Product $product)
                 $params['extra_data'] = ExtraDataSupporterTag::fromOrderItemParams($params, $this->user);
                 break;
             // TODO: look at migrating to extra_data
-            case 'username-change':
+            case Product::USERNAME_CHANGE:
                 // ignore received cost
                 $params['cost'] = $this->user->usernameChangeCost();
                 break;

app/Models/Store/OrderItem.php

@@ -115,7 +115,7 @@ public function getCustomClassInstance()
     {
         // only one for now
         if ($this->product->custom_class === 'username-change') {
-            return new ChangeUsername($this->order->user, $this->extra_info);
+            return new ChangeUsername($this->order->user, $this->extra_info ?? '');
         }
     }
 

app/Models/Store/Product.php

@@ -40,8 +40,10 @@
  */
 class Product extends Model
 {
+    const BUTTON_DISABLED = [self::SUPPORTER_TAG_NAME, self::USERNAME_CHANGE];
     const REDIRECT_PLACEHOLDER = 'redirect';
     const SUPPORTER_TAG_NAME = 'supporter-tag';
+    const USERNAME_CHANGE = 'username-change';
 
     protected $primaryKey = 'product_id';
 

resources/views/store/products/show.blade.php

@@ -128,7 +128,7 @@ class="js-store-item-quantity form-select__input"
                 <button
                     class="btn-osu-big btn-osu-big--store-action js-login-required--click js-store-add-to-cart"
                     type="submit"
-                    {{ $product->custom_class === App\Models\Store\Product::SUPPORTER_TAG_NAME ? 'disabled' : '' }}
+                    {{ in_array($product->custom_class, App\Models\Store\Product::BUTTON_DISABLED, true) ? 'disabled' : '' }}
                 >
                     {{ osu_trans('store.product.add_to_cart') }}
                 </button>