Merge branch 'pipiv2' into 'new-master'
Pipiv2 See merge request online-sistem1/kaunter!142
This commit is contained in:
@@ -4160,7 +4160,7 @@ class KhazanahController extends Controller
|
|||||||
$upahsimpanxtra = $xtra['upahsimpan'];
|
$upahsimpanxtra = $xtra['upahsimpan'];
|
||||||
$bakilelongxtra = $xtra['bakilelong'];
|
$bakilelongxtra = $xtra['bakilelong'];
|
||||||
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
|
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
|
||||||
$rugilelongxtra = -($xtra['kerugianlelong']);
|
$rugilelongxtra = -($xtra['kerugianlelong']);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Terkumpul
|
//Terkumpul
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ return [
|
|||||||
'options' => extension_loaded('pdo_mysql') ? array_filter([
|
'options' => extension_loaded('pdo_mysql') ? array_filter([
|
||||||
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
|
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
|
||||||
]) : [],
|
]) : [],
|
||||||
|
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'pgsql' => [
|
'pgsql' => [
|
||||||
|
|||||||
@@ -2234,7 +2234,7 @@
|
|||||||
sumberat += parseFloat(value);
|
sumberat += parseFloat(value);
|
||||||
});
|
});
|
||||||
|
|
||||||
var jenistebus = $('#sltjenistebus').find(":selected").val();
|
var jenistebus = $('#sltjenistebus').find(":selected").val();
|
||||||
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
|
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
|
||||||
var jbg = "{{ $gadai['tempoh'] }}";
|
var jbg = "{{ $gadai['tempoh'] }}";
|
||||||
var kadarupah = "{{ $gadai['kadarupah'] }}";
|
var kadarupah = "{{ $gadai['kadarupah'] }}";
|
||||||
|
|||||||
Reference in New Issue
Block a user