fix division when member import

Modules/Client/Transformers/DashboardResources.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Modules\Client\Transformers;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DashboardResources extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        $myLimitBalance = (int)$this->currentPolicy->limit_balance;
+        $myLimitTotal = (int)$this->currentPolicy->total_premi;
+
+        $lockBalance = (int)$this->currentPolicy->minimal_stop_service_net;
+        $lockPercentage = (int)$this->currentPolicy->minimal_stop_service_percentage;
+
+        return [
+            'policy' => [
+                'myLimit' => [
+                    'balance' => $myLimitBalance,
+                    'total' => $myLimitTotal,
+                    'percentage' => ($myLimitBalance / $myLimitTotal) * 100,
+                ],
+                'lockLimit' => [
+                    'balance' => $lockBalance,
+                    'percentage' => $lockPercentage
+                ]
+            ],
+        ];
+    }
+}

Modules/Internal/Http/Controllers/Api/CorporateController.php

@@ -33,7 +33,6 @@ class CorporateController extends Controller
             ->with('currentPolicy', 'subCorporates')
             ->withCount([
                 'employees',
-                                    'corporatePlans',
                 'corporateBenefits',
             ])
             ->where('type', 'corporate')
@@ -199,7 +198,8 @@ class CorporateController extends Controller
         //
     }
 
-    public function activation(Request $request, $corporate_id) {
+    public function activation(Request $request, $corporate_id)
+    {
         $request->validate([
             'active' => 'required'
         ]);
@@ -253,7 +253,6 @@ class CorporateController extends Controller
                 $result_headers = array_keys($headers_map_to_table_fields);
                 $result_headers = array_merge($result_headers, ['Ingest Code', 'Ingest Note']);
                 $import->addArrayToRow($result_headers);
-                
             }
 
             $doc_headers_indexes = [];
@@ -289,7 +288,6 @@ class CorporateController extends Controller
                             'Ingest Code' => 200,
                             'Ingest Note' => 'Success',
                         ]), $sheet->getName());
-
                     } catch (ImportRowException $e) {
                         // Write Data Validation Error to File
                         $import->addArrayToRow(array_merge($row_data, [

Modules/Internal/Http/Controllers/Api/CorporateMemberController.php

@@ -35,9 +35,9 @@ class CorporateMemberController extends Controller
             ->with([
                 'employeds',
                 'currentPolicy',
-                        'claims' => function ($claim) {
+                // 'claims' => function ($claim) {
-                            return $claim->used();
+                //     return $claim->used();
-                        }
+                // }
             ])
             ->with('currentPlan')
             ->paginate()
@@ -182,7 +182,6 @@ class CorporateMemberController extends Controller
                         $failed_member_data[] = ['row_number' => $index, 'error' => $e->getMessage()];
                     }
                 }
-
             }
 
             break; //only read first sheet

Modules/Internal/Http/Controllers/Api/DivisionController.php

@@ -44,7 +44,6 @@ class DivisionController extends Controller
         $request->validate([
             'code' => [
                 'required',
-                Rule::unique('corporate_plans')->where('corporate_id', $corporate_id)
             ],
             'name' => 'required'
         ]);

Modules/Internal/Services/MemberEnrollmentService.php

@@ -27,7 +27,7 @@ class MemberEnrollmentService
         "Halodoc Member ID"                                                         => "halodoc_member_id",
         "Corporate ID"                                                              => "corporate_id",
         "NIK"                                                                       => "nik",
-        "Division"                                                                  => "division_code",
+        "Division"                                                                  => "division_name",
         "Branch Code"                                                               => "branch_code",
         "Bank Info"                                                                 => "banks_info",
         "Language"                                                                  => "language",
@@ -106,7 +106,7 @@ class MemberEnrollmentService
         "halodoc_member_id"                 => "Halodoc Member ID",
         "corporate_id"                      => "Corporate ID",
         "nik"                               => "NIK",
-        "division_code"                     => "Division",
+        "division_name"                     => "Division",
         "branch_code"                       => "Branch Code",
         "banks_info"                        => "Bank Info",
         "language"                          => "Language",
@@ -327,13 +327,17 @@ class MemberEnrollmentService
             throw new ImportRowException(__('enrollment.NAME_REQUIRED'), 0, null, $row);
         }
 
-        if (!empty($row['telephone_mobile'])
+        if (
-        && !(substr($row['telephone_mobile'], 0, 4) == '+628' || substr($row['telephone_mobile'], 0, 3) == '628')) {
+            !empty($row['telephone_mobile'])
+            && !(substr($row['telephone_mobile'], 0, 4) == '+628' || substr($row['telephone_mobile'], 0, 3) == '628')
+        ) {
             throw new ImportRowException(__('enrollment.PHONE_INVALID'), 0, null, $row);
         }
 
-        if (!empty($row['email'])
+        if (
-        && !filter_var($row['email'], FILTER_VALIDATE_EMAIL)) {
+            !empty($row['email'])
+            && !filter_var($row['email'], FILTER_VALIDATE_EMAIL)
+        ) {
             throw new ImportRowException(__('enrollment.EMAIL_INVALID'), 0, null, $row);
         }
 
@@ -449,8 +453,28 @@ class MemberEnrollmentService
                             ]);
                             $memberPolicy->save();
 
-                            if (!empty($row['division'])) {
+                            if (!empty($row['division_name'])) {
-                                $division_id = CorporateDivision::where('code', $row['division_code'])->where('')->pluck('id');
+                                $division_id = CorporateDivision::query()->where('code', $row['division_name'])->pluck('id')->first();
+
+                                if (empty($division_id)) {
+                                    $corporateCodeArray = explode(' ', $row['division_name']);
+
+                                    if (!empty($corporateCodeArray[1])) {
+                                        $corporateCode = substr($corporateCodeArray[0], 0, 1) . substr($corporateCodeArray[1], 0, 1);
+                                    } elseif (!empty($corporateCodeArray[2])) {
+                                        $corporateCode = substr($corporateCodeArray[0], 0, 1) . substr($corporateCodeArray[1], 0, 1);
+                                    } else {
+                                        $corporateCode = substr($row['division_name'], 0, 1);
+                                    }
+
+                                    $division = CorporateDivision::query()->create([
+                                        'corporate_id' => $corporate->id,
+                                        'name' => $row['division_name'],
+                                        'code' => $corporateCode,
+                                    ]);
+
+                                    $division_id = $division->id;
+                                }
                             }
 
                             $member->employeds()->create([
@@ -583,7 +607,8 @@ class MemberEnrollmentService
                         throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_INVALID'), 0, null, $row);
                     }
 
-                    if (Carbon::parse($memberPolicy->end) > Carbon::parse(strtotime($row['member_expiry_date']))
+                    if (
+                        Carbon::parse($memberPolicy->end) > Carbon::parse(strtotime($row['member_expiry_date']))
                         || $memberPolicy->end > Carbon::parse(strtotime($row['member_expiry_date']))
                     ) {
                         throw new ImportRowException(__('enrollment.MEMBER_RENEWAL_STILL_ACTIVE'), 0, null, $row);
@@ -625,7 +650,8 @@ class MemberEnrollmentService
                         throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_INVALID'), 0, null, $row);
                     }
 
-                    if (Carbon::parse($memberPolicy->end) > Carbon::parse(strtotime($row['member_expiry_date']))
+                    if (
+                        Carbon::parse($memberPolicy->end) > Carbon::parse(strtotime($row['member_expiry_date']))
                         || $memberPolicy->end > Carbon::parse(strtotime($row['member_expiry_date']))
                     ) {
                         throw new ImportRowException(__('enrollment.MEMBER_RENEWAL_STILL_ACTIVE'), 0, null, $row);
@@ -761,14 +787,16 @@ class MemberEnrollmentService
                             $corporateEmployee = CorporateEmployee::where('corporate_id', $oldCorporate->id)
                                 ->where('member_id', $memberPolicy->member->id)
                                 ->first();
-                            $newCorporateEmployee = CorporateEmployee::updateOrCreate([
+                            $newCorporateEmployee = CorporateEmployee::updateOrCreate(
+                                [
                                     'corporate_id' => $oldCorporate->id,
                                     'member_id' => $memberPolicy->member->id
                                 ],
                                 [
                                     'corporate_id' => $newCorporate->id,
                                     'member_id' => $memberPolicy->member->id
-                            ]);
+                                ]
+                            );
                         }
 
                         if (!empty($policy_number_new)) {

app/Models/Member.php

@@ -89,7 +89,7 @@ class Member extends Model
             ->belongsToMany(Corporate::class, 'corporate_employees', 'corporate_id', 'member_id')
             ->withPivot([
                 'branch_code',
-                    'divison_id',
+                'division_id',
                 'nik',
                 'status',
                 'start',
@@ -176,8 +176,7 @@ class Member extends Model
             return $query
                 ->where('member_id', 'like', "%" . $search . "%")
                 ->orWhere('payor_id', 'like', "%" . $search . "%")
-                    ->orWhere('name', 'like', "%" . $search . "%")
+                ->orWhere('name', 'like', "%" . $search . "%");
-                    ;
             // ->orWhereHas('corporatePlan', function ($query) use ($search) {
             //     $query->where('code', 'like', "%" . $search . "%");
             // });

database/migrations/2022_11_22_135948_create_claims_table.php

@@ -32,9 +32,6 @@ return new class extends Migration
             $table->dateTime('approved_at')->nullable();
             $table->unsignedBigInteger('approved_by')->nullable()->index();
 
-            $table->dateTime('approved_at')->nullable();
-            $table->unsignedBigInteger('approved_by')->nullable()->index();
-
             $table->dateTime('paid_at')->nullable();
             $table->unsignedBigInteger('paid_by')->nullable()->index();