extend invoice api (#88)

Memurame · Apr 5, 2024 · 59c610c · 59c610c
1 parent 44decfd
commit 59c610c
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 7 deletions.
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
@@ -508,10 +508,10 @@
     );
 
     $routes->delete("invoice/(:num)", 'apiInvoiceController::delete/$1');
-    $routes->delete(
-        "invoice/position/(:num)",
-        'apiInvoicePosController::delete/$1',
-    );
+    $routes->get("invoice/(:num)", 'apiInvoiceController::show/$1');
+
+
+    $routes->delete("invoice/position/(:num)",'apiInvoicePosController::delete/$1');
     $routes->post(
         "invoice/position/(:num)/copy",
         'apiInvoicePosController::saveAsTemplate/$1'

diff --git a/app/Controllers/apiInvoiceController.php b/app/Controllers/apiInvoiceController.php
@@ -15,6 +15,35 @@ class apiInvoiceController extends BaseController
 {
     use ResponseTrait;
 
+
+    public function show(int $invoiceId = null){
+
+        $invoice = model('InvoiceModel')
+            ->find($invoiceId);
+
+        if(!$invoice){
+            return $this->failNotFound("No invoice found");
+        }
+
+        $customer = model('CustomerModel')->find($invoice->customer_id);
+        $positions = model('InvoicePositionModel')
+            ->where('invoice_id', $invoice->id)
+            ->orderBy('ord', 'asc')
+            ->findAll();
+
+        $return = $invoice->prepareForReturn();
+        $return['customer'] = $customer->prepareForReturn();
+        if($positions){
+            foreach($positions as $pos){
+                $return['positions'][] = $pos->prepareForReturn();
+            }
+        }else{
+            $return['positions'] = [];
+        }
+
+        return $this->respond($return, 200);
+    }
+
     public function delete($invoiceId = null){
         $invoice = model('InvoiceModel')->find($invoiceId);
 

diff --git a/app/Controllers/apiInvoicePosController.php b/app/Controllers/apiInvoicePosController.php
@@ -111,10 +111,10 @@ public function moveUp($invoicePosId){
         $invoicePos = model('InvoicePositionModel')->find($invoicePosId);
         $invoicePosList = model('InvoicePositionModel')
         ->where('invoice_id', $invoicePos->invoice_id)
-        ->where('ord <', $invoicePos->ord)
+        ->where('ord <=', $invoicePos->ord)
         ->orderBy('ord', 'desc')
         ->findAll();
-
+        
         foreach($invoicePosList as $pos){
             if($pos->ord < $invoicePos->ord){
                 $prevPos = $pos->ord;
@@ -135,7 +135,7 @@ public function moveDown($invoicePosId){
         $invoicePos = model('InvoicePositionModel')->find($invoicePosId);
         $invoicePosList = model('InvoicePositionModel')
         ->where('invoice_id', $invoicePos->invoice_id)
-        ->where('ord >', $invoicePos->ord)
+        ->where('ord >=', $invoicePos->ord)
         ->orderBy('ord')
         ->findAll();
 

diff --git a/app/Entities/Invoice.php b/app/Entities/Invoice.php
@@ -163,4 +163,28 @@ public function getBillingAddress(){
 
         return $this->address;
     }
+
+    /* ########################################################
+     * Ab hier sind Funktionen für die API
+     #########################################################*/
+     public function prepareForReturn(){
+        $r = model('InvoiceModel')
+            ->find($this->id);
+
+        $return = [];
+        $return['id'] = $r->id;
+        $return['date_invoice'] = $r->invoice;
+        $return['paid'] = $r->paid;
+        $return['renew'] = $r->renew;
+        $return['intervall'] = $r->renew_intervall;
+        $return['renewed'] = $r->renewed;
+        $return['description'] = $r->description;
+        $return['note']['top'] = $r->notes_top;
+        $return['note']['bottom'] = $r->notes_bottom;
+        $return['contact']['name'] = $r->contact_name;
+        $return['contact']['phone'] = $r->contact_phone;
+        $return['contact']['mail'] = $r->contact_mail;
+
+        return $return ?? null;
+    }
 }
diff --git a/app/Entities/InvoicePosition.php b/app/Entities/InvoicePosition.php
@@ -69,4 +69,27 @@ public function getPositionUnitprice($inkl = true){
 
         return round($total,2);
     }
+
+    /* ########################################################
+     * Ab hier sind Funktionen für die API
+     #########################################################*/
+     public function prepareForReturn(){
+        $r = model('InvoicePositionModel')
+            ->find($this->id);
+
+        $return = [];
+        $return['id'] = $r->id;
+        $return['position'] = $r->position;
+        $return['title'] = $r->title;
+        $return['description'] = $r->description;
+        $return['price'] = $r->price;
+        $return['price_inkl'] = $r->price_inkl;
+        $return['amount'] = $r->amount;
+        $return['mwst'] = $r->mwst;
+        $return['notes'] = $r->notes;
+        $return['type'] = $r->type;
+        $return['order'] = $r->ord;
+
+        return $return ?? null;
+    }
 }