wip

app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForIndex.php

@@ -3,10 +3,12 @@
 namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns;
 
 use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder;
+use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrderItem;
 use App\Nova\Resources\Branch\Branch;
 use App\Repos\Order\OrderRepo;
 use App\Repos\System\Settings\Location\RegionRepo;
 use Closure;
+use Laravel\Nova\Fields\Boolean;
 use Laravel\Nova\Fields\Badge;
 use Laravel\Nova\Fields\BelongsTo;
 use Laravel\Nova\Fields\DateTime;
@@ -63,17 +65,28 @@ class VisaMasterPaymentOrderFieldsForIndex
                 ->icons(OrderRepo::statusIcons())
                 ->sortable(),
 
-            Text::make(__('Paid'), static::paidField()),
+            Text::make(sprintf('%s (%s)', __('Paid'), __('This month')), function () use ($resource) {
+                return static::paidField($resource);
+            }),
         ];
     }
 
     /**
      * Paid field
      */
-    public static function paidField(): Closure
+    public static function paidField($resource)
     {
-        return function () {
+        $paid = false;
-            return 'OK';
+        $items = $resource->paymentItems;
-        };
+
+        foreach ($items as $item) {
+            if (boolval($item->paid)) {
+                if ($item->created_at->format('m') == date('m')) {
+                    $paid = true;
+                }
+            }
+        }
+
+        return $paid ? 'Tölenen' : 'Tölenmedik';
     }
 }

app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php

@@ -3,8 +3,8 @@
 namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources;
 
 use App\Models\Branch\Branch;
-use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder;
 use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder as VisaMasterPaymentOrderModel;
+use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder;
 use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns\VisaMasterAuth;
 use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns\VisaMasterPaymentOrderFieldsForDetail;
 use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns\VisaMasterPaymentOrderFieldsForIndex;
@@ -18,6 +18,7 @@ use App\Repos\System\Settings\Location\RegionRepo;
 use Ebess\AdvancedNovaMediaLibrary\Fields\Files;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Laravel\Nova\Fields\Badge;
 use Laravel\Nova\Fields\HasMany;
@@ -63,9 +64,9 @@ class NovaVisaMasterPaymentOrder extends Resource
     /**
      * The relationships that should be eager loaded on index queries.
      *
-     * @var array
+     * @var array<int, string>
      */
-    public static $with = ['branch'];
+    public static $with = ['branch', 'paymentItems'];
 
     /**
      * Indicates whether the resource should automatically poll for new resources.

lang/tk.json

@@ -331,5 +331,7 @@
     "Make payment": "Töleg",
     "Visa/Master, Sber Settings": "Visa/Master, Sber sazlamalar",
     "Loan order required docs": "Karz gerekli resminamalary",
-    "Required docs": "Gerekli resminamalar"
+    "Required docs": "Gerekli resminamalar",
+    "Payment items": "Тöleg taryhy",
+    "This month": "Şul aý"
 }