Refine

Author: ildyria

app/Enum/ConfigType.php

@@ -25,4 +25,5 @@ enum ConfigType: string
 	case ADMIN_USER = 'admin_user';
 	case LICENSE = 'license';
 	case MAP_PROVIDER = 'map_provider';
+	case CURRENCY = 'currency';
 }

app/Http/Controllers/Shop/CheckoutController.php

@@ -97,6 +97,7 @@ public function process(ProcessRequest $request): CheckoutResource
 	 */
 	public function finalize(FinalizeRequest $request): CheckoutResource
 	{
+		/** @disregard P1013 */
 		$order = $this->checkout_service->handlePaymentReturn($request->basket(), $request->all(), $request->provider_type());
 
 		if ($order->status !== PaymentStatusType::COMPLETED) {

app/Http/Middleware/ConfigIntegrity.php

@@ -64,6 +64,9 @@ class ConfigIntegrity
 		'watermark_shift_x_direction',
 		'watermark_shift_y',
 		'watermark_shift_y_direction',
+		'webshop_enabled',
+		'webshop_currency',
+		'webshop_default_description',
 		'live_metrics_enabled',
 		'live_metrics_access',
 		'live_metrics_max_time',

app/Http/Resources/Rights/AlbumRightsResource.php

@@ -13,6 +13,7 @@
 use App\Models\Configs;
 use App\Policies\AlbumPolicy;
 use Illuminate\Support\Facades\Gate;
+use LycheeVerify\Verify;
 use Spatie\LaravelData\Data;
 use Spatie\TypeScriptTransformer\Attributes\TypeScript;
 
@@ -30,6 +31,7 @@ class AlbumRightsResource extends Data
 	public bool $can_access_original = false;
 	public bool $can_pasword_protect = false;
 	public bool $can_import_from_server = false;
+	public bool $can_make_purchasable = false;
 
 	/**
 	 * Given an album, returns the access rights associated to it.
@@ -47,5 +49,28 @@ public function __construct(?AbstractAlbum $abstract_album)
 		$this->can_access_original = Gate::check(AlbumPolicy::CAN_ACCESS_FULL_PHOTO, [AbstractAlbum::class, $abstract_album]);
 		$this->can_pasword_protect = !Configs::getValueAsBool('cache_enabled');
 		$this->can_import_from_server = Gate::check(AlbumPolicy::CAN_IMPORT_FROM_SERVER, [AbstractAlbum::class]);
+		$this->can_make_purchasable = $this->canMakePurchasable($abstract_album);
+	}
+
+	/**
+	 * Check if the user can make the album purchasable.
+	 * This requires the user to be a supporter and have the relevant permission.
+	 *
+	 * @param AbstractAlbum|null $abstract_album
+	 *
+	 * @return bool
+	 */
+	public function canMakePurchasable(?AbstractAlbum $abstract_album): bool
+	{
+		if (!$abstract_album instanceof Album) {
+			return false;
+		}
+
+		$verify = resolve(Verify::class);
+		if (!$verify->is_supporter()) {
+			return false;
+		}
+
+		return Gate::check(AlbumPolicy::CAN_MAKE_PURCHASABLE, [AbstractAlbum::class]);
 	}
 }

app/Http/Resources/Rights/ModulesRightsResource.php

@@ -31,6 +31,7 @@ class ModulesRightsResource extends Data
 	public bool $is_watermarker_enabled = false;
 	public bool $is_photo_timeline_enabled = false;
 	public bool $is_mod_renamer_enabled = false;
+	public bool $is_mod_webshop_enabled = false;
 
 	public function __construct()
 	{
@@ -43,6 +44,7 @@ public function __construct()
 		$this->is_watermarker_enabled = $this->isWatermarkerEnabled($is_logged_in);
 		$this->is_photo_timeline_enabled = $this->isTimelinePhotosEnabled($is_logged_in);
 		$this->is_mod_renamer_enabled = $this->isRenamerEnabled();
+		$this->is_mod_webshop_enabled = $this->isWebshopEnabled();
 	}
 
 	/**
@@ -163,4 +165,18 @@ private function isRenamerEnabled(): bool
 
 		return true;
 	}
+
+	/**
+	 * Check if the webshop module is enabled.
+	 *
+	 * @return bool true if the webshop is enabled, false otherwise
+	 */
+	private function isWebshopEnabled(): bool
+	{
+		if (!$this->verify->check()) {
+			return false;
+		}
+
+		return Configs::getValueAsBool('webshop_enabled');
+	}
 }

app/Http/Resources/Shop/PriceResource.php

@@ -15,13 +15,19 @@
 use Spatie\LaravelData\Data;
 use Spatie\TypeScriptTransformer\Attributes\TypeScript;
 
+/**
+ * This containes the Price information for the purchasable item.
+ * Both price and price_cents are provided for convenience.
+ * price is used for display purposes, while price_cents is used for calculations.
+ */
 #[TypeScript()]
 class PriceResource extends Data
 {
 	public function __construct(
 		public PurchasableSizeVariantType $size_variant,
 		public PurchasableLicenseType $license_type,
 		public string $price,
+		public int $price_cents,
 	) {
 	}
 
@@ -36,6 +42,7 @@ public static function fromModel(PurchasablePrice $price): PriceResource
 			size_variant: $price->size_variant,
 			license_type: $price->license_type,
 			price: $money_service->format($price->price_cents),
+			price_cents: intval($price->price_cents->getAmount()),
 		);
 	}
 }

app/Http/Resources/Shop/PurchasableResource.php

@@ -8,7 +8,10 @@
 
 namespace App\Http\Resources\Shop;
 
+use App\Models\Configs;
 use App\Models\Purchasable;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
 use Spatie\LaravelData\Data;
 use Spatie\TypeScriptTransformer\Attributes\LiteralTypeScriptType;
 use Spatie\TypeScriptTransformer\Attributes\TypeScript;
@@ -33,13 +36,16 @@ public function __construct(
 	 */
 	public static function fromModel(Purchasable $item): PurchasableResource
 	{
+		/** @var User|null $user */
+		$user = Auth::user();
+
 		return new self(
 			purchasable_id: $item->id,
 			album_id: $item->album_id,
 			photo_id: $item->photo_id,
 			prices: $item->prices->map(PriceResource::fromModel(...))->toArray(),
-			owner_notes: $item->owner_notes,
-			description: $item->description,
+			owner_notes: $user?->may_administrate === true ? $item->owner_notes : null,
+			description: $item->description ?? Configs::getValueAsString('webshop_default_description'),
 			is_active: $item->is_active,
 		);
 	}

app/Models/Configs.php

@@ -152,6 +152,21 @@ public function sanity(?string $candidate_value, ?string $message_template = nul
 					$message = sprintf($message_template, 'a valid license');
 				}
 				break;
+			case ConfigType::CURRENCY->value:
+				$bundle = \ResourceBundle::create('en', 'ICUDATA-curr');
+				$currencies = $bundle->get('Currencies');
+				$found = false;
+				foreach ($currencies as $code => $data) {
+					$found = ($code === $candidate_value);
+					if ($found) {
+						break; // we found it, stop searching
+					}
+				}
+				if (!$found) {
+					$message = sprintf($message_template, 'a valid ISO 4217 currency code');
+					break;
+				}
+				break;
 			case ConfigType::MAP_PROVIDER->value:
 				if (MapProviders::tryFrom($candidate_value) === null) {
 					$message = sprintf($message_template, 'a valid map provider');

app/Policies/AlbumPolicy.php

@@ -44,6 +44,7 @@ class AlbumPolicy extends BasePolicy
 	public const CAN_IMPORT_FROM_SERVER = 'canImportFromServer';
 	public const CAN_SHARE_ID = 'canShareById';
 	public const CAN_READ_METRICS = 'canReadMetrics';
+	public const CAN_MAKE_PURCHASABLE = 'canMakePurchasable';
 
 	/**
 	 * This ensures that current album is owned by current user.
@@ -600,4 +601,18 @@ public function canReadMetrics(?User $user, AbstractAlbum $album): bool
 			default => false,
 		};
 	}
+
+	/**
+	 * Check whether the user can make the album purchasable.
+	 * Only admins can do that, so we return false here.
+	 * Admin case is handled by the before() method in BasePolicy.
+	 *
+	 * @param User $user
+	 *
+	 * @return bool
+	 */
+	public function canMakePurchasable(User $user): bool
+	{
+		return false;
+	}
 }

app/Services/MoneyService.php

@@ -8,6 +8,7 @@
 
 namespace App\Services;
 
+use App\Models\Configs;
 use Money\Currencies\ISOCurrencies;
 use Money\Currency;
 use Money\Formatter\DecimalMoneyFormatter;
@@ -27,7 +28,7 @@ class MoneyService
 	 */
 	public function getDefaultCurrencyCode(): string
 	{
-		return config('omnipay.currency', 'EUR');
+		return Configs::getValueAsString('webshop_currency');
 	}
 
 	/**