Merge pull request 'dev' (#20) from dev into main

Reviewed-on: #20

backend/src/main/java/com/printcalculator/controller/admin/AdminOrderController.java

@@ -101,13 +101,16 @@ public class AdminOrderController {
 
     @PostMapping("/{orderId}/payments/confirm")
     @Transactional
-    public ResponseEntity<OrderDto> confirmPayment(
+    public ResponseEntity<OrderDto> updatePaymentMethod(
             @PathVariable UUID orderId,
             @RequestBody(required = false) Map<String, String> payload
     ) {
         getOrderOrThrow(orderId);
         String method = payload != null ? payload.get("method") : null;
-        paymentService.confirmPayment(orderId, method);
+        if (method == null || method.isBlank()) {
+            throw new ResponseStatusException(BAD_REQUEST, "Payment method is required");
+        }
+        paymentService.updatePaymentMethod(orderId, method);
         return ResponseEntity.ok(toOrderDto(getOrderOrThrow(orderId)));
     }
 

backend/src/main/java/com/printcalculator/service/PaymentService.java

@@ -98,4 +98,20 @@ public class PaymentService {
 
         return payment;
     }
+
+    @Transactional
+    public Payment updatePaymentMethod(UUID orderId, String method) {
+        if (method == null || method.isBlank()) {
+            throw new IllegalArgumentException("Payment method is required");
+        }
+
+        Order order = orderRepo.findById(orderId)
+                .orElseThrow(() -> new RuntimeException("Order not found with id " + orderId));
+
+        Payment payment = paymentRepo.findByOrder_Id(orderId)
+                .orElseGet(() -> getOrCreatePaymentForOrder(order, "OTHER"));
+
+        payment.setMethod(method.trim().toUpperCase());
+        return paymentRepo.save(payment);
+    }
 }

frontend/src/app/features/admin/pages/admin-dashboard.component.html

@@ -163,12 +163,12 @@
           </select>
           <button
             type="button"
-            (click)="confirmPayment()"
+            (click)="updatePaymentMethod()"
-            [disabled]="
+            [disabled]="confirmingPayment"
-              confirmingPayment || selectedOrder.paymentStatus === 'COMPLETED'
-            "
           >
-            {{ confirmingPayment ? "Invio..." : "Conferma pagamento" }}
+            {{
+              confirmingPayment ? "Salvataggio..." : "Cambia metodo pagamento"
+            }}
           </button>
         </div>
       </div>

frontend/src/app/features/admin/pages/admin-dashboard.component.ts

@@ -132,14 +132,14 @@ export class AdminDashboardComponent implements OnInit {
     });
   }
 
-  confirmPayment(): void {
+  updatePaymentMethod(): void {
     if (!this.selectedOrder || this.confirmingPayment) {
       return;
     }
 
     this.confirmingPayment = true;
     this.adminOrdersService
-      .confirmPayment(this.selectedOrder.id, this.selectedPaymentMethod)
+      .updatePaymentMethod(this.selectedOrder.id, this.selectedPaymentMethod)
       .subscribe({
         next: (updatedOrder) => {
           this.confirmingPayment = false;
@@ -147,7 +147,7 @@ export class AdminDashboardComponent implements OnInit {
         },
         error: () => {
           this.confirmingPayment = false;
-          this.errorMessage = 'Conferma pagamento non riuscita.';
+          this.errorMessage = 'Aggiornamento metodo pagamento non riuscito.';
         },
       });
   }

frontend/src/app/features/admin/services/admin-orders.service.ts

@@ -59,7 +59,7 @@ export class AdminOrdersService {
     });
   }
 
-  confirmPayment(orderId: string, method: string): Observable<AdminOrder> {
+  updatePaymentMethod(orderId: string, method: string): Observable<AdminOrder> {
     return this.http.post<AdminOrder>(
       `${this.baseUrl}/${orderId}/payments/confirm`,
       { method },