فهرست منبع

Require predicted sold date when creating or updating a lead

Alan Lam 3 سال پیش
والد
کامیت
6af3bf9b32
3فایلهای تغییر یافته به همراه11 افزوده شده و 8 حذف شده
  1. 4 7
      controllers/sale.php
  2. 6 0
      views/modals/new_sale.php
  3. 1 1
      views/sale.php

+ 4 - 7
controllers/sale.php

@@ -103,13 +103,9 @@ $controller = new class($number) {
 		$sale = $this->getSale();
 		if(!$sale) {
 			$location_id = $this->request->int("location_id");
-			$location = Location::get($location_id);
-			if(!$location) {
-				throw new RuntimeException(__("Location not found."));
-			}
+			$location = Location::require($location_id);
 
 			$sale = new Sale();
-			$sale->company_id = $company->id;
 			$sale->location_id = $location->id;
 			$sale->user_id = $this->user->id;
 			$sale->status = SaleStatuses::NEW;
@@ -119,11 +115,9 @@ $controller = new class($number) {
 			$success_message = __("Lead created successfully.");
 		}
 		else {
-			$sale->company_id = $company->id;
 			$sale->status = $this->request->int("status");
 			$sale->currency = $this->request->string("currency");
 			$sale->tax_rate = $this->request->decimal("tax_rate", 2);
-			$sale->date_predicted_sold = $this->request->date("date_predicted_sold");
 
 			if(!SaleStatuses::validate($sale->status)) {
 				throw new RuntimeException(__("Status is invalid."));
@@ -134,6 +128,9 @@ $controller = new class($number) {
 			$success_message = __("Lead updated successfully.");
 		}
 
+		$sale->company_id = $company->id;
+		$sale->date_predicted_sold = $this->request->date("date_predicted_sold");
+
 		$sale->commit();
 
 		if(Http::isAjax()) {

+ 6 - 0
views/modals/new_sale.php

@@ -50,6 +50,12 @@ $default_company_id = $settings->defaultCompanyId ?? null;
 					</select>
 				</div>
 
+				<div class="mb-3">
+					<label class="form-label" for="date-predicted-sold"><?=htmlspecialchars(__("Predicted Sold Date"))?></label>
+					<input class="form-control" type="date" name="date_predicted_sold" id="date-predicted-sold" placeholder="<?=htmlspecialchars(__("Predicted Sold Date"))?>" required />
+				</div>
+
+
 			</div>
 			<div class="modal-footer">
 				<button type="submit" class="btn btn-success">

+ 1 - 1
views/sale.php

@@ -60,7 +60,7 @@ $location = $sale->getLocation();
 					<div class="col-md">
 						<div class="mb-3">
 							<label class="form-label" for="date-predicted-sold"><?=htmlspecialchars(__("Predicted Sold Date"))?></label>
-							<input class="form-control" type="date" name="date_predicted_sold" id="date-predicted-sold" value="<?=htmlspecialchars($sale->date_predicted_sold)?>" />
+							<input class="form-control" type="date" name="date_predicted_sold" id="date-predicted-sold" value="<?=htmlspecialchars($sale->date_predicted_sold)?>" required />
 						</div>
 					</div>
 				</div>