done second

app/Http/Controllers/SemakController.php

@@ -28,6 +28,11 @@ class SemakController extends Controller
 
     public function SenaraiSAG(Request $request)
     {
+
+        $validated = $request->validate([
+            'sltcawangan' => 'required'
+        ]);
+
         $auth_user = Auth::user();
 
         $belum_tebus = Http::get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'belum_tebus/' . $request->sltcawangan)->json();

composer.lock

@@ -6664,5 +6664,6 @@
     "platform": {
         "php": "^7.3|^8.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "2.0.0"
 }

config/session.php

@@ -33,7 +33,7 @@ return [
 
     'lifetime' => env('SESSION_LIFETIME', 120),
 
-    'expire_on_close' => false,
+    'expire_on_close' => true,
 
     /*
     |--------------------------------------------------------------------------

public/argon/js/argon.js

@@ -933,8 +933,8 @@ var OrdersChart = (function() {
 		var NamaBulan = new Array();
 		
 		$.ajax({
-			url:'http://localhost:8000/portal/financeMonth/',
+			url: api_url + '/portal/financeMonth/',
-			data:{'icno' : '821230015194'},
+			data:{'icno' : icno},
 			method:'GET',
 			async:false,
 			success:function(data){
@@ -1037,8 +1037,8 @@ var SalesChart = (function() {
 		var NamaBulan = new Array();
 		
 		$.ajax({
-			url:'http://localhost:8000/portal/financeMonth/',
+			url: api_url + '/portal/financeMonth/',
-			data:{'icno' : '821230015194'},
+			data:{'icno' : icno},
 			method:'GET',
 			async:false,
 			success:function(data){

public/argon/js/bootstrap-notify.js

@@ -0,0 +1,350 @@
+/* 
+* Project: Bootstrap Notify = v3.1.3
+* Description: Turns standard Bootstrap alerts into "Growl-like" notifications.
+* Author: Mouse0270 aka Robert McIntosh
+* License: MIT License
+* Website: https://github.com/mouse0270/bootstrap-growl
+*/
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD. Register as an anonymous module.
+		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		// Node/CommonJS
+		factory(require('jquery'));
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
+}(function ($) {
+	// Create the defaults once
+	var defaults = {
+			element: 'body',
+			position: null,
+			type: "info",
+			allow_dismiss: true,
+			newest_on_top: false,
+			showProgressbar: false,
+			placement: {
+				from: "top",
+				align: "right"
+			},
+			offset: 20,
+			spacing: 10,
+			z_index: 1031,
+			delay: 5000,
+			timer: 1000,
+			url_target: '_blank',
+			mouse_over: null,
+			animate: {
+				enter: 'animated fadeInDown',
+				exit: 'animated fadeOutUp'
+			},
+			onShow: null,
+			onShown: null,
+			onClose: null,
+			onClosed: null,
+			icon_type: 'class',
+			template: '<div data-notify="container" class="col-xs-11 col-sm-4 alert alert-{0}" role="alert"><button type="button" aria-hidden="true" class="close" data-notify="dismiss">&times;</button><span data-notify="icon"></span> <span data-notify="title">{1}</span> <span data-notify="message">{2}</span><div class="progress" data-notify="progressbar"><div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div></div><a href="{3}" target="{4}" data-notify="url"></a></div>'
+		};
+
+	String.format = function() {
+		var str = arguments[0];
+		for (var i = 1; i < arguments.length; i++) {
+			str = str.replace(RegExp("\\{" + (i - 1) + "\\}", "gm"), arguments[i]);
+		}
+		return str;
+	};
+
+	function Notify ( element, content, options ) {
+		// Setup Content of Notify
+		var content = {
+			content: {
+				message: typeof content == 'object' ? content.message : content,
+				title: content.title ? content.title : '',
+				icon: content.icon ? content.icon : '',
+				url: content.url ? content.url : '#',
+				target: content.target ? content.target : '-'
+			}
+		};
+
+		options = $.extend(true, {}, content, options);
+		this.settings = $.extend(true, {}, defaults, options);
+		this._defaults = defaults;
+		if (this.settings.content.target == "-") {
+			this.settings.content.target = this.settings.url_target;
+		}
+		this.animations = {
+			start: 'webkitAnimationStart oanimationstart MSAnimationStart animationstart',
+			end: 'webkitAnimationEnd oanimationend MSAnimationEnd animationend'
+		}
+
+		if (typeof this.settings.offset == 'number') {
+		    this.settings.offset = {
+		    	x: this.settings.offset,
+		    	y: this.settings.offset
+		    };
+		}
+
+		this.init();
+	};
+
+	$.extend(Notify.prototype, {
+		init: function () {
+			var self = this;
+
+			this.buildNotify();
+			if (this.settings.content.icon) {
+				this.setIcon();
+			}
+			if (this.settings.content.url != "#") {
+				this.styleURL();
+			}
+			this.placement();
+			this.bind();
+
+			this.notify = {
+				$ele: this.$ele,
+				update: function(command, update) {
+					var commands = {};
+					if (typeof command == "string") {					
+						commands[command] = update;
+					}else{
+						commands = command;
+					}
+					for (var command in commands) {
+						switch (command) {
+							case "type":
+								this.$ele.removeClass('alert-' + self.settings.type);
+								this.$ele.find('[data-notify="progressbar"] > .progress-bar').removeClass('progress-bar-' + self.settings.type);
+								self.settings.type = commands[command];
+								this.$ele.addClass('alert-' + commands[command]).find('[data-notify="progressbar"] > .progress-bar').addClass('progress-bar-' + commands[command]);
+								break;
+							case "icon":
+								var $icon = this.$ele.find('[data-notify="icon"]');
+								if (self.settings.icon_type.toLowerCase() == 'class') {
+									$icon.removeClass(self.settings.content.icon).addClass(commands[command]);
+								}else{
+									if (!$icon.is('img')) {
+										$icon.find('img');
+									}
+									$icon.attr('src', commands[command]);
+								}
+								break;
+							case "progress":
+								var newDelay = self.settings.delay - (self.settings.delay * (commands[command] / 100));
+								this.$ele.data('notify-delay', newDelay);
+								this.$ele.find('[data-notify="progressbar"] > div').attr('aria-valuenow', commands[command]).css('width', commands[command] + '%');
+								break;
+							case "url":
+								this.$ele.find('[data-notify="url"]').attr('href', commands[command]);
+								break;
+							case "target":
+								this.$ele.find('[data-notify="url"]').attr('target', commands[command]);
+								break;
+							default:
+								this.$ele.find('[data-notify="' + command +'"]').html(commands[command]);
+						};
+					}
+					var posX = this.$ele.outerHeight() + parseInt(self.settings.spacing) + parseInt(self.settings.offset.y);
+					self.reposition(posX);
+				},
+				close: function() {
+					self.close();
+				}
+			};
+		},
+		buildNotify: function () {
+			var content = this.settings.content;
+			this.$ele = $(String.format(this.settings.template, this.settings.type, content.title, content.message, content.url, content.target));
+			this.$ele.attr('data-notify-position', this.settings.placement.from + '-' + this.settings.placement.align);		
+			if (!this.settings.allow_dismiss) {
+				this.$ele.find('[data-notify="dismiss"]').css('display', 'none');
+			}
+			if ((this.settings.delay <= 0 && !this.settings.showProgressbar) || !this.settings.showProgressbar) {
+				this.$ele.find('[data-notify="progressbar"]').remove();
+			}
+		},
+		setIcon: function() {
+			if (this.settings.icon_type.toLowerCase() == 'class') {
+				this.$ele.find('[data-notify="icon"]').addClass(this.settings.content.icon);
+			}else{
+				if (this.$ele.find('[data-notify="icon"]').is('img')) {
+					this.$ele.find('[data-notify="icon"]').attr('src', this.settings.content.icon);
+				}else{
+					this.$ele.find('[data-notify="icon"]').append('<img src="'+this.settings.content.icon+'" alt="Notify Icon" />');
+				}	
+			}
+		},
+		styleURL: function() {
+			this.$ele.find('[data-notify="url"]').css({
+				backgroundImage: 'url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)',
+				height: '100%',
+				left: '0px',
+				position: 'absolute',
+				top: '0px',
+				width: '100%',
+				zIndex: this.settings.z_index + 1
+			});
+			this.$ele.find('[data-notify="dismiss"]').css({
+				position: 'absolute',
+				right: '10px',
+				top: '5px',
+				zIndex: this.settings.z_index + 2
+			});
+		},
+		placement: function() {
+			var self = this,
+				offsetAmt = this.settings.offset.y,
+				css = {
+					display: 'inline-block',
+					margin: '0px auto',
+					position: this.settings.position ?  this.settings.position : (this.settings.element === 'body' ? 'fixed' : 'absolute'),
+					transition: 'all .5s ease-in-out',
+					zIndex: this.settings.z_index
+				},
+				hasAnimation = false,
+				settings = this.settings;
+
+			$('[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])').each(function() {
+				return offsetAmt = Math.max(offsetAmt, parseInt($(this).css(settings.placement.from)) +  parseInt($(this).outerHeight()) +  parseInt(settings.spacing));
+			});
+			if (this.settings.newest_on_top == true) {
+				offsetAmt = this.settings.offset.y;
+			}
+			css[this.settings.placement.from] = offsetAmt+'px';
+
+			switch (this.settings.placement.align) {
+				case "left":
+				case "right":
+					css[this.settings.placement.align] = this.settings.offset.x+'px';
+					break;
+				case "center":
+					css.left = 0;
+					css.right = 0;
+					break;
+			}
+			this.$ele.css(css).addClass(this.settings.animate.enter);
+			$.each(Array('webkit', 'moz', 'o', 'ms', ''), function(index, prefix) {
+				self.$ele[0].style[prefix+'AnimationIterationCount'] = 1;
+			});
+
+			$(this.settings.element).append(this.$ele);
+
+			if (this.settings.newest_on_top == true) {
+				offsetAmt = (parseInt(offsetAmt)+parseInt(this.settings.spacing)) + this.$ele.outerHeight();
+				this.reposition(offsetAmt);
+			}
+			
+			if ($.isFunction(self.settings.onShow)) {
+				self.settings.onShow.call(this.$ele);
+			}
+
+			this.$ele.one(this.animations.start, function(event) {
+				hasAnimation = true;
+			}).one(this.animations.end, function(event) {
+				if ($.isFunction(self.settings.onShown)) {
+					self.settings.onShown.call(this);
+				}
+			});
+
+			setTimeout(function() {
+				if (!hasAnimation) {
+					if ($.isFunction(self.settings.onShown)) {
+						self.settings.onShown.call(this);
+					}
+				}
+			}, 600);
+		},
+		bind: function() {
+			var self = this;
+
+			this.$ele.find('[data-notify="dismiss"]').on('click', function() {		
+				self.close();
+			})
+
+			this.$ele.mouseover(function(e) {
+				$(this).data('data-hover', "true");
+			}).mouseout(function(e) {
+				$(this).data('data-hover', "false");
+			});
+			this.$ele.data('data-hover', "false");
+
+			if (this.settings.delay > 0) {
+				self.$ele.data('notify-delay', self.settings.delay);
+				var timer = setInterval(function() {
+					var delay = parseInt(self.$ele.data('notify-delay')) - self.settings.timer;
+					if ((self.$ele.data('data-hover') === 'false' && self.settings.mouse_over == "pause") || self.settings.mouse_over != "pause") {
+						var percent = ((self.settings.delay - delay) / self.settings.delay) * 100;
+						self.$ele.data('notify-delay', delay);
+						self.$ele.find('[data-notify="progressbar"] > div').attr('aria-valuenow', percent).css('width', percent + '%');
+					}
+					if (delay <= -(self.settings.timer)) {
+						clearInterval(timer);
+						self.close();
+					}
+				}, self.settings.timer);
+			}
+		},
+		close: function() {
+			var self = this,
+				$successors = null,
+				posX = parseInt(this.$ele.css(this.settings.placement.from)),
+				hasAnimation = false;
+
+			this.$ele.data('closing', 'true').addClass(this.settings.animate.exit);
+			self.reposition(posX);			
+			
+			if ($.isFunction(self.settings.onClose)) {
+				self.settings.onClose.call(this.$ele);
+			}
+
+			this.$ele.one(this.animations.start, function(event) {
+				hasAnimation = true;
+			}).one(this.animations.end, function(event) {
+				$(this).remove();
+				if ($.isFunction(self.settings.onClosed)) {
+					self.settings.onClosed.call(this);
+				}
+			});
+
+			setTimeout(function() {
+				if (!hasAnimation) {
+					self.$ele.remove();
+					if (self.settings.onClosed) {
+						self.settings.onClosed(self.$ele);
+					}
+				}
+			}, 600);
+		},
+		reposition: function(posX) {
+			var self = this,
+				notifies = '[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])',
+				$elements = this.$ele.nextAll(notifies);
+			if (this.settings.newest_on_top == true) {
+				$elements = this.$ele.prevAll(notifies);
+			}
+			$elements.each(function() {
+				$(this).css(self.settings.placement.from, posX);
+				posX = (parseInt(posX)+parseInt(self.settings.spacing)) + $(this).outerHeight();
+			});
+		}
+	});
+
+	$.notify = function ( content, options ) {
+		var plugin = new Notify( this, content, options );
+		return plugin.notify;
+	};
+	$.notifyDefaults = function( options ) {
+		defaults = $.extend(true, {}, defaults, options);
+		return defaults;
+	};
+	$.notifyClose = function( command ) {
+		if (typeof command === "undefined" || command == "all") {
+			$('[data-notify]').find('[data-notify="dismiss"]').trigger('click');
+		}else{
+			$('[data-notify-position="'+command+'"]').find('[data-notify="dismiss"]').trigger('click');
+		}
+	};
+
+}));

resources/views/analisa/index.blade.php

@@ -5,8 +5,23 @@
 
     <!-- Header -->
     <div class="header bg-primary pb-6">
+       
       <div class="container-fluid">
 
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+              <div class="col-lg-6 col-7">
+
+                <nav aria-label="breadcrumb" class="d-none d-md-inline-block ml-md-4">
+                  <ol class="breadcrumb breadcrumb-links breadcrumb-dark">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fas fa-home"></i></a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Analisa</li>
+                  </ol>
+                </nav>
+              </div>
+            </div>
+          </div>
+
                   <!-- Card stats -->
                   <div class="row">
                     <div class="col-xl-3 col-lg-6">
@@ -237,6 +252,9 @@
 
     <script>
 
+        var api_url = "{{  config('api.url') }}";
+        var icno = "{{ Auth::User()->icno }}";    
+
         var hargaemastable = $('#harga_emas').DataTable({
             "bLengthChange": false,
             "bFilter": false,
@@ -264,7 +282,6 @@
         });
         
 
-
     </script>
 @endsection
 

resources/views/dashboard.blade.php

@@ -27,54 +27,89 @@
 
     <div class="container-fluid mt--7">
     
-        <div class="card bg-secondary mx-auto shadow col-md-10 col-sm-12 col-xl-6 rounded mt-4" style="z-index: 1;background-color:#ecf0f1;">
             <div class="row d-flex justify-content-center">
 
-                <div class="col-xl-4 col-sm-12">
+                <div class="col-xl-2 col-sm-12">
-                    <a href="{{ route('semaksag') }}"><div class="card mb-4 mb-xl-0 mt-5 bg-primary">
+                    <div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
-                        <div class="card-body">
+                    <a href="{{ route('semaksag') }}"><div class="card mb-4 mb-xl-0 mt-2 bg-primary">
-                            <div class="row">
+                        <div class="card-body text-center">
-                                <div class="col mt-2">
-                                    {{-- <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> --}}
-                                    <span class="h2 font-weight-bold text-white">Semak</span>
-                                </div>
-                                <div class="col-auto">
-                                    <div class="icon icon-shape bg-danger text-white rounded-circle shadow">
-                                        <i class="fas fa-clipboard-check"></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div></a>
-                </div>
                                 
-                <div class="col-xl-5 col-sm-12">
-                    <a href="{{ route('pembayaransag') }}"><div class="card mb-sm-0 mb-4 mb-xl-0 ml-sm-0 mt-5 bg-primary">
-                        <div class="card-body">
-                            <div class="row">
-                                <div class="col mt-2">
-                                    {{-- <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> --}}
-                                    <span class="h2 font-weight-bold mb-0 text-white">Pembayaran</span>
-                                </div>
                                 <div class="col-auto">
-                                    <div class="icon icon-shape bg-danger text-white rounded-circle shadow">
+                                    <div class="icon icon-shape text-white rounded-circle shadow">
-                                        <i class="fas fa-money-bill"></i>
+                                        <i class="fas fa-clipboard-check text-warning" style="font-size:50px !important;"></i>
                                     </div>
                                 </div>
+                                <div class="col mt-2">
+                                    <span class="h2 font-weight-bold text-white">SEMAK</span>
                                 </div>
                         </div>
                     </div></a>
                     </div>
                 </div>
 
-            <div class="row mt-5 d-flex justify-content-center">
+                <div class="col-xl-2 col-sm-12">
+                    <div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
+                    <a href="{{ route('pembayaransag') }}"><div class="card mb-sm-0 mb-4 mb-xl-0 ml-sm-0 mt-2 bg-primary">
+                        <div class="card-body text-center">
+                                <div class="col-auto">
+                                    <div class="icon icon-shape text-white rounded-circle shadow">
+                                        <i class="fas fa-money-bill text-green" style="font-size:50px !important;"></i>
+                                    </div>
+                                </div>
+                                <div class="col mt-2">
+                                    <span class="h2 font-weight-bold mb-0 text-white">PEMBAYARAN</span>
+                                </div>
+                        </div>
+                    </div></a>
+                    </div>
+                </div>
+
+                <div class="col-xl-2 col-sm-12">
+                    <div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
+                    <a href="#"><div class="card mb-sm-0 mb-5 bg-primary mt-2">
+                        <div class="card-body text-center">
+                                <div class="col-auto">
+                                    <div class="icon icon-shape bg-yellow text-white rounded-circle shadow">
+                                        <i class="fas fa-hand-holding text-secondary" style="font-size:50px !important;"></i>
+                                    </div>
+                                </div>
+                                <div class="col mt-2">
+                                    <span class="h2 font-weight-bold mb-0 text-white">TEBUS</span>
+                                </div>
+                        </div>
+                    </div></a>
+                    </div>
+                </div>
+
+
+                <div class="col-xl-2 col-sm-12">
+                    <div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
+                    <a href="{{ route('analisa.index') }}"><div class="card bg-primary mt-2">
+                        <div class="card-body text-center">
+                                <div class="col-auto">
+                                    <div class="icon icon-shape text-white rounded-circle shadow">
+                                        <i class="fas fa-chart-bar text-red" style="font-size:50px !important;"></i>
+                                    </div>
+                                </div>
+                                <div class="col mt-2">
+                                    <span class="h2 font-weight-bold mb-0 text-white">ANALISA</span>
+                                </div>
+                        </div>
+                    </div></a>
+                    </div>
+                </div>
+                
+
+            </div>
+
+            {{-- <div class="row mt-5 d-flex justify-content-center">
                 
                 <div class="col-xl-4 col-sm-12">
                     <a href="#"><div class="card mb-sm-0 mb-5 bg-primary">
                         <div class="card-body">
                             <div class="row">
                                 <div class="col mt-2">
-                                    {{-- <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> --}}
+                                    <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> 
                                     <span class="h2 font-weight-bold mb-0 text-white">Tebus</span>
                                 </div>
                                 <div class="col-auto">
@@ -92,7 +127,7 @@
                         <div class="card-body">
                             <div class="row">
                                 <div class="col mt-2">
-                                    {{-- <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> --}}
+                                     <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> 
                                     <span class="h2 font-weight-bold mb-0 text-white">Penyata</span>
                                 </div>
                                 <div class="col-auto">
@@ -110,7 +145,7 @@
                         <div class="card-body">
                             <div class="row">
                                 <div class="col mt-2">
-                                    {{-- <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5> --}}
+                                    <h5 class="card-title text-uppercase text-muted mb-0">Traffic</h5>
                                     <span class="h2 font-weight-bold mb-0 text-white">Analisa</span>
                                 </div>
                                 <div class="col-auto">
@@ -122,11 +157,13 @@
                         </div>
                     </div></a>
                 </div>
-            </div>
+            </div> --}}
-        </div>
+      
 
       
     </div>
+
+
 @endsection
 
 @push('js')

resources/views/layouts/app.blade.php

@@ -29,6 +29,11 @@
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
         <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script>
+        <link
+        rel="stylesheet"
+        href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
+      />
+        <script src="{{ asset('argon') }}/js/bootstrap-notify.js"></script>
 
 
     </head>

resources/views/layouts/navbars/navs/auth.blade.php

@@ -8,8 +8,12 @@
                 <a class="h4 mb-0 text-white text-uppercase font-weight-bold ml-sm-4 ml-lg-0 d-sm-block d-lg-inline-block">Selamat Datang, {{ auth()->user()->name }}</a>
             </div>
 
+            @php 
+                $logDate = date("d-m-Y h:i:s", strtotime(session('logindate')));
+            @endphp
+
             <div class="row">
-                <span class="text-white d-none d-lg-inline-block">Log masuk terakhir pada Date</span>
+                <span class="text-white d-none d-lg-inline-block">Log masuk terakhir pada {{ $logDate }}</span>
             </div>
         </div>
        

resources/views/layouts/navbars/sidebar.blade.php

@@ -6,7 +6,7 @@
         </button>
         <!-- Brand -->
         <a class="navbar-brand pt-0" href="{{ route('home') }}">
-            <img src="{{ asset('argon') }}/img/brand/blue.png" class="navbar-brand-img" alt="...">
+            <img src="{{ asset('argon') }}/img/brand/logo_arrahn_baru.png" class="navbar-brand-img" style="max-height:9rem !important;" alt="...">
         </a>
         <!-- User -->
         <ul class="nav align-items-center d-md-none">

resources/views/pembayaran/senaraibayaran.blade.php

@@ -3,6 +3,25 @@
 @section('content')
     @include('layouts.headers.cards')
 
+    @error('chkboxsag')
+    <script>
+        $.notify({
+            icon: 'fas fa-exclamation-triangle fa-2x',
+            newest_on_top: true,
+            message: "<strong style='font-size:15px;'>Sila pilih salah satu checkbox di atas terlebih dahulu!</strong>"
+          },{
+            type: 'danger',
+            allow_dismiss: false,
+            placement:{ align:'center',from:'bottom'},
+            animate: {
+            enter: 'animated bounceInDown',
+
+            exit: 'animated bounceOutUp'
+          }
+        });
+      </script>
+  @enderror
+
     <!-- Header -->
     <div class="header bg-primary pb-6">
       <div class="container-fluid">
@@ -29,12 +48,12 @@
     <div class="container-fluid mt--6">
       <div class="row">
         <div class="col">
-          <div class="card">
+          
             <br>
             <div class="container col-11 shadow-lg p-3 mb-5 bg-white rounded">
               <!-- Card header -->
               <div class="card-header border-0">
-                <h3 class="mb-0">Belum Tawarruq</h3>
+                <h3 class="mb-0">Pembayaran SAG</h3>
               </div>
 
               <form method="post" action="{{ route('payment.action') }}" onsubmit="return validateform()">
@@ -57,7 +76,7 @@
                     </thead>
                     <tbody class="list">
                     @foreach($belum_tebus as $index=>$bt)
-                      @if($bt['hargajualan'] == '')
+                      @if($bt['hargajualan'] != '')
                         <tr>
                           <th scope="row">
                             <div class="media align-items-center">
@@ -103,7 +122,7 @@
                 </div>
             </form>
             </div>
-          </div>
+          
         </div>
       </div>
 

resources/views/penyata/penyata.blade.php

@@ -115,6 +115,13 @@
     </style>
 </head>
 <body>
+
+    @php
+     
+     $mytime = Carbon\Carbon::now()->format('d-m-Y');
+
+    @endphp
+
 <page size="A4">
     <h6 class="header">SULIT DAN PERSENDIRIAN</h6>
     <table id="header">
@@ -162,11 +169,7 @@
             <tr>
                 <td style="padding-top:30px;">Tarikh Cetak:</td>
                 <td style="padding-top:30px;">@php
-
+                    echo($mytime);
-                    $myDateTime = DateTime::createFromFormat('Y-m-d', '2021-04-04');
-                    $formattedweddingdate = $myDateTime->format('d-m-Y');
-                    echo($formattedweddingdate);
-                
                 @endphp</td>
             </tr>
         </table>
@@ -216,8 +219,6 @@
     <tr>
             <td>@php 
                     $timestamp = strtotime($trans['created_at']);
-                    // $myDateTime = DateTime::createFromFormat('Y-m-d', timestamp);
-                    // $formattedweddingdate = $myDateTime->format('d-m-Y');
                     echo gmdate("d-m-Y",$timestamp);
             
             @endphp</td>
@@ -262,7 +263,6 @@
 
     <div class="center">
         <button onclick="window.print()">Cetak</button>
-        <button>Lihat Baki</button>
     </div>
 
 

resources/views/penyata/summary.blade.php

@@ -147,6 +147,13 @@
     </style>
 </head>
 <body>
+
+    @php
+     
+    $mytime = Carbon\Carbon::now()->format('d-m-Y');
+
+   @endphp
+
 <page size="A4">
     <h6 class="header">SULIT DAN PERSENDIRIAN</h6>
     <table id="header">
@@ -191,13 +198,7 @@
             </tr>
             <tr>
                 <td style="padding-top:30px;">Tarikh Cetak:</td>
-                <td style="padding-top:30px;">@php
+                <td style="padding-top:30px;">{{ $mytime }}</td>
-
-                    $myDateTime = DateTime::createFromFormat('Y-m-d', '2021-04-04');
-                    $formattedweddingdate = $myDateTime->format('d-m-Y');
-                    echo($formattedweddingdate);
-                
-                @endphp</td>
             </tr>
         </table>
 
@@ -225,7 +226,7 @@
                         @endphp </td>
                     <td></td>
                     <td style="text-align:center;">:</td>
-                    <td style="text-align:right;">{{ number_format($gad['pinjaman'],2) }}</td>
+                    <td style="text-align:right;">{{ number_format($gad['hargajualan'],2) }}</td>
             </tr>
             @endforeach
             @foreach($transaction as $index=>$trans)
@@ -260,98 +261,13 @@
                 <th style="text-align: left;border-top:1px solid black;border-bottom:1px solid black;">BAKI KESELURUHAN</th>
                 <td></td>
                 <td style="text-align:center;">:</td>
-                <td style="font-weight:bold;text-align:right;border-top:1px solid black;border-bottom:1px solid black;">{{ number_format($gad['bakipjm'],2) }}</td>
+                <td style="font-weight:bold;text-align:right;border-top:1px solid black;border-bottom:1px solid black;">{{ number_format($gad['bakihargajualan'],2) }}</td>
             </tr>
         </table>
 
     </div>
-
-    {{-- <h6 class="middleheader">AR-RAHN</h6> --}}
     <br>
 
-    {{-- <table class="statements">
-        <tr>
-            <th rowspan="2">TARIKH URUSNIAGA</th>
-            <th rowspan="2">KETERANGAN</th>
-            <th rowspan="2">RUJUKAN</th>
-            <th colspan="2">AMAUN(RM)</th>
-            <th rowspan="2">BAKI (RM)</th>
-        </tr>
-    <tr>
-        <th>DEBIT</th>
-        <th>KREDIT</th>
-    </tr>
-    <tr>
-        <td></td>
-        <td><i><u><b>Pembiayaan</b></u></i></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-    </tr>
-    @foreach($gadai as $index1=>$gad)
-    <tr>
-            <td>@php 
-                
-                $myDateTime = DateTime::createFromFormat('Y-m-d', $gad['t_gadai']);
-                $formattedweddingdate = $myDateTime->format('d-m-Y');
-                echo($formattedweddingdate)
-                
-                @endphp</td>
-            <td>Pelanggan Gadai</td>
-            <td>{{ $gad['norujukan'] }}</td>
-            <td>{{ number_format($gad['pinjaman'],2) }}</td>
-            <td></td>
-            <td>{{ number_format($gad['pinjaman'],2) }}</td>
-    </tr>
-    @endforeach
-    @foreach($transaction as $index=>$trans)
-    <tr>
-            <td>@php 
-                    $timestamp = strtotime($trans['created_at']);
-                    // $myDateTime = DateTime::createFromFormat('Y-m-d', timestamp);
-                    // $formattedweddingdate = $myDateTime->format('d-m-Y');
-                    echo gmdate("d-m-Y",$timestamp);
-            
-            @endphp</td>
-            <td>
-            @php
-                switch($trans['trans_type']){
-
-                    case 'T': echo 'Pelanggan Tebus';
-                    break;
-                    case 'A': echo 'Bayaran Ansuran';
-                    break;
-                    case 'S': echo 'Pelanggan Tebus Sebahagian';
-                    break;
-                    case 'P': echo 'Pelanggan Tambah Pinjaman';
-                    break;
-                }
-
-
-            @endphp</td>
-            <td>{{ $trans['norujukan'] }}</td>
-            @if($trans['trans_type'] != 'P')
-                <td></td>
-                <td>{{ number_format($trans['duit_masuk'],2) }}</td>
-            @else 
-                <td>{{ number_format($trans['duit_masuk'],2) }}</td>
-                <td></td>
-            @endif
-
-            <td>{{ number_format($trans['bakiharga'],2) }}</td>
-    </tr>
-    @endforeach
-    <tr>
-        <td></td>
-        <td><i><u><b>Baki Keseluruhan</b></u></i></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td style="font-weight:bold;">{{ number_format($gad['bakipjm'],2) }}</td>
-    </tr>
-    </table> --}}
-
     <hr>
 
     <div>
@@ -362,15 +278,17 @@
                 <th>Norujukan</th>   
                 <th>Pembiayaan</th>  
                 <th>Jumlah Pembiayaan</th>   
+                <th></th>
             </tr>  
             <tr>
-                <th><input type="checkbox" name="chkboxnorujukan"/>{{ $gad['norujukan'] }}</th>
+                <td><input type="checkbox" name="chkboxnorujukan"/>{{ $gad['norujukan'] }}</td>
-                <th><span>{{ number_format($gad['pinjaman'],2) }}</span></th>
+                <td><span>{{ number_format($gad['bakihargajualan'],2) }}</span></td>
-                <th><input type="text"/></th>
+                <td><input type="text"/></td>
+                <td><button type="submit" class="btn-sub">Bayar</button></td>
             </tr>
         </table>
         
-        <button type="submit" class="btn-sub">Bayar</button>
+        
         </form>
 
     </div>

resources/views/semak/semaksag.blade.php

@@ -26,27 +26,45 @@
           <div class="container-fluid mt--6">
             <div class="row">
               <div class="col">
-                <div class="card">
+                <div class="card col-xl-5 mx-auto mt-4">
                   <!-- Card header -->
                   <div class="card-header border-0">
-                    <h3 class="mb-0">Semak Butiran SAG</h3>
                   </div>
                   <div class="card-body">
+                    @error('sltcawangan')
+                        <script>
+                            $.notify({
+                                icon: 'fas fa-exclamation-triangle fa-2x',
+                                newest_on_top: true,
+                                message: "<strong style='font-size:15px;'>Sila pilih cawangan terlebih dahulu sebelum tekan semak!</strong>"
+                              },{
+                                type: 'danger',
+                                allow_dismiss: false,
+                                placement:{ align:'center',from:'bottom'},
+                                animate: {
+                                enter: 'animated bounceInDown',
+
+                                exit: 'animated bounceOutUp'
+                              }
+                            });
+                          </script>
+                    @enderror
+
                     <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
                       <form name="semaksagform" action="{{ route('senaraisag') }}" method="POST">
                         @csrf
-                      <div>
+                      <div class="row">
-                          <label class="block mt-4">
+                          <label class="block col-4 mt-2">
                               <span class="text-gray-700">Pilih Cawangan</span>
                             </label>
-                            <select class="custom-select" name="sltcawangan">
+                            <select class="custom-select col-8" name="sltcawangan">
                               <option selected disabled>Open this select menu</option>
                               @foreach($cawangan as $index1=>$caw)
-                                <option value="{{ $caw['kodcaw'] }}">{{ $caw['kodcaw'] }}</option>
+                                <option value="{{ $caw['kodcaw'] }}">{{ $caw['namacawangan'] }}</option>
                               @endforeach
                             </select>
                       </div>
-                      <button type="submit" href="{{ route('senaraisag') }}" class="btn btn-primary mt-3">
+                      <button type="submit" href="{{ route('senaraisag') }}" class="btn btn-primary mt-3 mx-auto d-flex">
                           Semak
                       </button>
                       </form>