From 046ecc50d8abb77658941e9dbd27af6825e09c7f Mon Sep 17 00:00:00 2001
From: BTMS2 <btms2@BTMS2s-MacBook-Pro.local>
Date: Mon, 15 Jul 2024 08:20:56 +0800
Subject: [PATCH] tambah condition tagujrah masa nak export data

---
 app/Http/Controllers/LelongController.php     | 48 +++++++++++++------
 ...120241_add_tag_ujrah_in_lelongbidxlaku.php | 36 ++++++++++++++
 2 files changed, 69 insertions(+), 15 deletions(-)
 create mode 100644 database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 8f9c4caf..81b0c32f 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -182,22 +182,40 @@ class LelongController extends Controller
         ->where('status_payment_opt', '=', 3)
         ->where('kodcaw', '=', $cawanganLelong->cawangan->caw_code)
         ->sum('total_payment');
-        // dd($cawanganLelong->cawangan->caw_code, $request->tarikh_lelong, $lelongDetails->masamula_lelong, $lelongDetails->masatamat_lelong, $lelongBidMaster->toArray(), $lelongbidmarhun->toArray(), floatval($paymentOnline), floatval($paymentTunai), floatval($paymentCdm));
+        //dd($cawanganLelong->cawangan->caw_code, $request->tarikh_lelong, $lelongDetails->masamula_lelong, $lelongDetails->masatamat_lelong, $lelongBidMaster->toArray(), $lelongbidmarhun->toArray(), floatval($paymentOnline), floatval($paymentTunai), floatval($paymentCdm));
+       
+        if($cawanganLelong->tagujrah == 0){
+            $exportData = Http::withOptions(['verify' => config('app.api_verify')])->post(
+                config('app.api_url') . 'exportLelong',
+                [
+                    'kodcaw' => $cawanganLelong->cawangan->caw_code,
+                    'tarikh' => $request->tarikh_lelong,
+                    'masadari' => $lelongDetails->masamula_lelong,
+                    'masahingga' => $lelongDetails->masatamat_lelong,
+                    'lelongbid' => $lelongBidMaster->toArray(),
+                    'lelongbidmarhun' => $lelongbidmarhun->toArray(),
+                    'gldetail' => floatval($paymentOnline),
+                    'tunai' => floatval($paymentTunai),
+                    'gldetailcdm' => floatval($paymentCdm),
+                ]
+            )->json();
+        }elseif($cawanganLelong->tagujrah == 1){
+            $exportData = Http::withOptions(['verify' => config('app.api_verify')])->post(
+                config('app.api_ujrah_url') . 'exportLelong',
+                [
+                    'kodcaw' => $cawanganLelong->cawangan->caw_code,
+                    'tarikh' => $request->tarikh_lelong,
+                    'masadari' => $lelongDetails->masamula_lelong,
+                    'masahingga' => $lelongDetails->masatamat_lelong,
+                    'lelongbid' => $lelongBidMaster->toArray(),
+                    'lelongbidmarhun' => $lelongbidmarhun->toArray(),
+                    'gldetail' => floatval($paymentOnline),
+                    'tunai' => floatval($paymentTunai),
+                    'gldetailcdm' => floatval($paymentCdm),
+                ]
+            )->json();
+        }
 
-        $exportData = Http::withOptions(['verify' => config('app.api_verify')])->post(
-            config('app.api_url') . 'exportLelong',
-            [
-                'kodcaw' => $cawanganLelong->cawangan->caw_code,
-                'tarikh' => $request->tarikh_lelong,
-                'masadari' => $lelongDetails->masamula_lelong,
-                'masahingga' => $lelongDetails->masatamat_lelong,
-                'lelongbid' => $lelongBidMaster->toArray(),
-                'lelongbidmarhun' => $lelongbidmarhun->toArray(),
-                'gldetail' => floatval($paymentOnline),
-                'tunai' => floatval($paymentTunai),
-                'gldetailcdm' => floatval($paymentCdm),
-            ]
-        )->json();
 
         $cawanganLelong->export_data_sts = "SUCCESS";
         $cawanganLelong->update();
diff --git a/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php b/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php
new file mode 100644
index 00000000..d25598d1
--- /dev/null
+++ b/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddTagUjrahInLelongbidxlaku extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('lelongbid_xlaku', function (Blueprint $table) {
+            $table->integer('tagujrah')->default(0);
+            $table->decimal('ujrah', 5, 2);
+            $table->decimal('onepercent', 5, 2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('lelongbid_xlaku', function (Blueprint $table) {
+            $table->dropColumn('tagujrah');
+            $table->dropColumn('ujrah');
+            $table->dropColumn('onepercent');
+        });
+    }
+}