diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index e7d9fad..b7b965a 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -244,11 +244,13 @@ class PaymentService extends CommonService implements PaymentInterface $rows[$clientEntity->getPK()]['services'][$serviceEntity->getPK()] = [ 'ip' => $serverEntity->getIP(), 'billing_at' => $serviceEntity->getBillingAt(), + 'amount' => 0, 'items' => [], ]; } //entities에 총 결제금액 설정 $rows[$clientEntity->getPK()]['services'][$serviceEntity->getPK()]['items'][] = ['title' => $entity->getTitle(), 'amount' => $entity->getAmount()]; + $rows[$clientEntity->getPK()]['services'][$serviceEntity->getPK()]['amount'] += $entity->getAmount(); $rows[$clientEntity->getPK()]['total_amount'] += $entity->getAmount(); return $rows; } diff --git a/app/Views/admin/payment/invoice.php b/app/Views/admin/payment/invoice.php index 1d2a801..2019405 100644 --- a/app/Views/admin/payment/invoice.php +++ b/app/Views/admin/payment/invoice.php @@ -2,7 +2,7 @@ section('content') ?>
-
+
@@ -32,26 +32,15 @@
- - - - - + + + + + - + diff --git a/app/Views/admin/payment/invoice_items.php b/app/Views/admin/payment/invoice_items.php new file mode 100644 index 0000000..6189828 --- /dev/null +++ b/app/Views/admin/payment/invoice_items.php @@ -0,0 +1,13 @@ +
서버 IP항목결제일
서버 IP항목결제일
-
    - -
  1. -
    -
    -
    -
    -
  2. - -
-
$service]); ?>
+ + + + + + + + + + + +
.
총계
\ No newline at end of file diff --git a/app/Views/admin/payment/invoice_mobile.php b/app/Views/admin/payment/invoice_mobile.php index d1b221b..62181ee 100644 --- a/app/Views/admin/payment/invoice_mobile.php +++ b/app/Views/admin/payment/invoice_mobile.php @@ -7,7 +7,7 @@ ===========================
    -
  1. 서버 IP: , 결제일:
  2. +
  3. 서버IP: , 결제금:원 , 결제일:
===========================