diff --git a/app/Http/Controllers/Sales/SalesContractController.php b/app/Http/Controllers/Sales/SalesContractController.php index acbb91c2..f1ed494b 100644 --- a/app/Http/Controllers/Sales/SalesContractController.php +++ b/app/Http/Controllers/Sales/SalesContractController.php @@ -24,7 +24,7 @@ public function saveProducts(Request $request): JsonResponse 'products' => 'required|array', 'products.*.product_id' => 'required|exists:sales_products,id', 'products.*.category_id' => 'required|exists:sales_product_categories,id', - 'products.*.development_fee' => 'required|numeric|min:0', + 'products.*.registration_fee' => 'required|numeric|min:0', 'products.*.subscription_fee' => 'required|numeric|min:0', ]); @@ -45,7 +45,7 @@ public function saveProducts(Request $request): JsonResponse 'management_id' => $management->id, 'category_id' => $product['category_id'], 'product_id' => $product['product_id'], - 'development_fee' => $product['development_fee'], + 'registration_fee' => $product['registration_fee'], 'subscription_fee' => $product['subscription_fee'], 'discount_rate' => 0, 'created_by' => auth()->id(), diff --git a/app/Models/Sales/SalesContractProduct.php b/app/Models/Sales/SalesContractProduct.php index 1158c34e..0a49b66c 100644 --- a/app/Models/Sales/SalesContractProduct.php +++ b/app/Models/Sales/SalesContractProduct.php @@ -15,7 +15,7 @@ * @property int $management_id * @property int $category_id * @property int $product_id - * @property float|null $development_fee + * @property float|null $registration_fee * @property float|null $subscription_fee * @property float $discount_rate * @property string|null $notes @@ -30,7 +30,7 @@ class SalesContractProduct extends Model 'management_id', 'category_id', 'product_id', - 'development_fee', + 'registration_fee', 'subscription_fee', 'discount_rate', 'notes', @@ -42,7 +42,7 @@ class SalesContractProduct extends Model 'management_id' => 'integer', 'category_id' => 'integer', 'product_id' => 'integer', - 'development_fee' => 'decimal:2', + 'registration_fee' => 'decimal:2', 'subscription_fee' => 'decimal:2', 'discount_rate' => 'decimal:2', 'created_by' => 'integer', @@ -89,11 +89,11 @@ public function creator(): BelongsTo } /** - * 테넌트별 총 개발비 + * 테넌트별 총 가입비 */ - public static function getTotalDevelopmentFee(int $tenantId): float + public static function getTotalRegistrationFee(int $tenantId): float { - return self::where('tenant_id', $tenantId)->sum('development_fee') ?? 0; + return self::where('tenant_id', $tenantId)->sum('registration_fee') ?? 0; } /** diff --git a/resources/views/sales/modals/partials/product-selection.blade.php b/resources/views/sales/modals/partials/product-selection.blade.php index 34328de1..2ad42d2c 100644 --- a/resources/views/sales/modals/partials/product-selection.blade.php +++ b/resources/views/sales/modals/partials/product-selection.blade.php @@ -63,7 +63,7 @@ class="px-4 py-2 text-sm font-medium rounded-lg whitespace-nowrap transition-col