From fa30570e38cf2f21655abe3fc3d89a61a833f8e4 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 22 Mar 2022 14:14:18 +0800 Subject: [PATCH 01/41] update package --- composer.json | 4 +- composer.lock | 229 ++++++++++++++++++++++++++------------------------ 2 files changed, 122 insertions(+), 111 deletions(-) diff --git a/composer.json b/composer.json index d4d20a88..6c0c5c04 100644 --- a/composer.json +++ b/composer.json @@ -8,9 +8,9 @@ "php": "^7.3|^8.0", "barryvdh/laravel-dompdf": "^0.9.0", "fruitcake/laravel-cors": "^2.0", - "guzzlehttp/guzzle": "^7.0.1", + "guzzlehttp/guzzle": "^7.4", "intervention/image": "^2.7", - "jomweb/billplz": "4.1", + "jomweb/billplz": "^4.4", "laravel/framework": "^8.65", "laravel/sanctum": "^2.13", "laravel/tinker": "^2.5", diff --git a/composer.lock b/composer.lock index 3ec90ca5..2ac71203 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2e5f0f0a7cad0c224615bb48a86d6a1b", + "content-hash": "19afa9eb7e1656eb3f55bbf757c7b260", "packages": [ { "name": "asm89/stack-cors", @@ -190,16 +190,16 @@ }, { "name": "clue/stream-filter", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/clue/stream-filter.git", - "reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320" + "reference": "d6169430c7731d8509da7aecd0af756a5747b78e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/stream-filter/zipball/aeb7d8ea49c7963d3b581378955dbf5bc49aa320", - "reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e", + "reference": "d6169430c7731d8509da7aecd0af756a5747b78e", "shasum": "" }, "require": { @@ -210,12 +210,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Clue\\StreamFilter\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "Clue\\StreamFilter\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -240,7 +240,7 @@ ], "support": { "issues": "https://github.com/clue/stream-filter/issues", - "source": "https://github.com/clue/stream-filter/tree/v1.5.0" + "source": "https://github.com/clue/stream-filter/tree/v1.6.0" }, "funding": [ { @@ -252,7 +252,7 @@ "type": "github" } ], - "time": "2020-10-02T12:38:20+00:00" + "time": "2022-02-21T13:15:14+00:00" }, { "name": "dflydev/dot-access-data", @@ -836,16 +836,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.0", + "version": "7.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94" + "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4", + "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4", "shasum": "" }, "require": { @@ -854,7 +854,7 @@ "guzzlehttp/psr7": "^1.8.3 || ^2.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2" + "symfony/deprecation-contracts": "^2.2 || ^3.0" }, "provide": { "psr/http-client-implementation": "1.0" @@ -878,12 +878,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -940,7 +940,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.0" + "source": "https://github.com/guzzle/guzzle/tree/7.4.2" }, "funding": [ { @@ -956,7 +956,7 @@ "type": "tidelift" } ], - "time": "2021-10-18T09:52:00+00:00" + "time": "2022-03-20T14:16:28+00:00" }, { "name": "guzzlehttp/promises", @@ -985,12 +985,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1044,16 +1044,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2", + "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2", "shasum": "" }, "require": { @@ -1077,7 +1077,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -1139,7 +1139,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "source": "https://github.com/guzzle/psr7/tree/2.2.1" }, "funding": [ { @@ -1155,7 +1155,7 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2022-03-20T21:55:58+00:00" }, { "name": "http-interop/http-factory-guzzle", @@ -1350,34 +1350,35 @@ }, { "name": "jomweb/billplz", - "version": "v4.1.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/jomweb/billplz.git", - "reference": "6449dcbb1b89fd9d98c1d68235b3801b1dc4ee25" + "reference": "7b8fdde601155106df007edbcf2d36bf77822aae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jomweb/billplz/zipball/6449dcbb1b89fd9d98c1d68235b3801b1dc4ee25", - "reference": "6449dcbb1b89fd9d98c1d68235b3801b1dc4ee25", + "url": "https://api.github.com/repos/jomweb/billplz/zipball/7b8fdde601155106df007edbcf2d36bf77822aae", + "reference": "7b8fdde601155106df007edbcf2d36bf77822aae", "shasum": "" }, "require": { - "jomweb/ringgit": "^2.1", - "laravie/codex": "^5.1", - "laravie/codex-filter": "^1.0", - "php": ">=7.2", + "jomweb/ringgit": "^2.3.1", + "laravie/codex": "^5.3.3", + "laravie/codex-filter": "^1.2.2", + "php": "^7.2 || ^8.0", "php-http/multipart-stream-builder": "^1.0" }, "require-dev": { - "mockery/mockery": "^1.3.1", - "php-http/curl-client": "^2.0", - "phpunit/phpunit": "^8.4 || ^9.0" + "mockery/mockery": "~1.3.1 || ^1.4.4", + "php-http/guzzle7-adapter": "^1.0", + "phpstan/phpstan": "^1.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10 || ^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -1398,9 +1399,19 @@ "description": "PHP Agnostic library for working with BillPlz API", "support": { "issues": "https://github.com/jomweb/billplz/issues", - "source": "https://github.com/jomweb/billplz/tree/4.x" + "source": "https://github.com/jomweb/billplz/tree/v4.4.0" }, - "time": "2020-02-17T14:15:32+00:00" + "funding": [ + { + "url": "https://paypal.me/crynobone", + "type": "custom" + }, + { + "url": "https://liberapay.com/crynobone", + "type": "liberapay" + } + ], + "time": "2022-02-08T03:36:54+00:00" }, { "name": "jomweb/ringgit", @@ -1822,40 +1833,40 @@ }, { "name": "laravie/codex", - "version": "v5.3.2", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/laravie/codex.git", - "reference": "07fbd9ffd09303b4964d305ad0c2bc738327def7" + "reference": "5434e8e33d008d3cf177dfa27b227d46995f97ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravie/codex/zipball/07fbd9ffd09303b4964d305ad0c2bc738327def7", - "reference": "07fbd9ffd09303b4964d305ad0c2bc738327def7", + "url": "https://api.github.com/repos/laravie/codex/zipball/5434e8e33d008d3cf177dfa27b227d46995f97ec", + "reference": "5434e8e33d008d3cf177dfa27b227d46995f97ec", "shasum": "" }, "require": { - "laravie/codex-common": "^1.4.3", + "laravie/codex-common": "^1.5.1", "php": "^7.2 || ^8.0" }, "require-dev": { "guzzlehttp/guzzle": "^7.0.1", - "laravie/codex-filter": "^1.2.1", + "laravie/codex-filter": "^1.2.2", "mockery/mockery": "^1.3.1", "php-http/guzzle7-adapter": "^1.0", "php-http/multipart-stream-builder": "^1.0", - "phpstan/phpstan": "^0.12.90", - "phpunit/phpunit": "^8.4 || ^9.3.3" + "phpstan/phpstan": "^1.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10" }, "suggest": { - "laravie/codex-filter": "Content filtering for Laravie Codex (^1.0)", + "laravie/codex-filter": "Content filtering for Laravie Codex (^1.2.2)", "php-http/multipart-stream-builder": "Allow to send multipart form request (^1.0)", - "phpunit/phpunit": "Allow to use Codex Faker request during testing (^8.4 || ^9.0)" + "phpunit/phpunit": "Allow to use Codex Faker request during testing (^8.5.21 || ^9.5.10)" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.x-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -1876,7 +1887,7 @@ "description": "PHP library for building API Client SDK for PHP", "support": { "issues": "https://github.com/laravie/codex/issues", - "source": "https://github.com/laravie/codex/tree/v5.3.2" + "source": "https://github.com/laravie/codex/tree/v5.3.3" }, "funding": [ { @@ -1888,20 +1899,20 @@ "type": "liberapay" } ], - "time": "2021-08-01T14:35:33+00:00" + "time": "2022-02-08T03:05:53+00:00" }, { "name": "laravie/codex-common", - "version": "v1.5.0", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/laravie/codex-common.git", - "reference": "c843dcc1aefd326251d3415f3d74db1da2213e3e" + "reference": "5eaa8bfc457b5c0a07c4663d7c2828244c9058a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravie/codex-common/zipball/c843dcc1aefd326251d3415f3d74db1da2213e3e", - "reference": "c843dcc1aefd326251d3415f3d74db1da2213e3e", + "url": "https://api.github.com/repos/laravie/codex-common/zipball/5eaa8bfc457b5c0a07c4663d7c2828244c9058a6", + "reference": "5eaa8bfc457b5c0a07c4663d7c2828244c9058a6", "shasum": "" }, "require": { @@ -1923,9 +1934,9 @@ "autoload": { "psr-4": { "Laravie\\Codex\\Common\\": "src/Common/", + "Laravie\\Codex\\Testing\\": "src/Testing/", "Laravie\\Codex\\Contracts\\": "src/Contracts/", - "Laravie\\Codex\\Exceptions\\": "src/Exceptions/", - "Laravie\\Codex\\Testing\\": "src/Testing/" + "Laravie\\Codex\\Exceptions\\": "src/Exceptions/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1941,7 +1952,7 @@ "description": "Common PHP library for building API Client SDK for PHP", "support": { "issues": "https://github.com/laravie/codex-common/issues", - "source": "https://github.com/laravie/codex-common/tree/v1.5.0" + "source": "https://github.com/laravie/codex-common/tree/v1.5.1" }, "funding": [ { @@ -1953,32 +1964,32 @@ "type": "liberapay" } ], - "time": "2022-01-06T03:05:05+00:00" + "time": "2022-02-08T02:29:24+00:00" }, { "name": "laravie/codex-filter", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/laravie/codex-filter.git", - "reference": "a902b7ce2faef50ca97508569900a96488a35a9e" + "reference": "0ff6a2556cb71e8080f1b92b82aa54630424d57b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravie/codex-filter/zipball/a902b7ce2faef50ca97508569900a96488a35a9e", - "reference": "a902b7ce2faef50ca97508569900a96488a35a9e", + "url": "https://api.github.com/repos/laravie/codex-filter/zipball/0ff6a2556cb71e8080f1b92b82aa54630424d57b", + "reference": "0ff6a2556cb71e8080f1b92b82aa54630424d57b", "shasum": "" }, "require": { "igorw/get-in": "^1.0", - "laravie/codex-common": "^1.4", + "laravie/codex-common": "^1.5.1", "php": "^7.2 || ^8.0" }, "require-dev": { - "mockery/mockery": "^1.3.1", - "php-http/guzzle7-adapter": "^0.1", - "phpstan/phpstan": "0.12.x-dev", - "phpunit/phpunit": "^8.4 || ^9.3.3" + "mockery/mockery": "~1.3.1 || ^1.4.4", + "php-http/guzzle7-adapter": "^1.0", + "phpstan/phpstan": "^1.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10" }, "type": "library", "extra": { @@ -2004,7 +2015,7 @@ "description": "Content filtering for Laravie Codex", "support": { "issues": "https://github.com/laravie/codex-filter/issues", - "source": "https://github.com/laravie/codex-filter/tree/v1.2.1" + "source": "https://github.com/laravie/codex-filter/tree/v1.2.2" }, "funding": [ { @@ -2016,7 +2027,7 @@ "type": "liberapay" } ], - "time": "2021-08-01T13:57:49+00:00" + "time": "2022-02-08T02:38:37+00:00" }, { "name": "league/commonmark", @@ -3338,16 +3349,16 @@ }, { "name": "php-http/httplug", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9" + "reference": "f640739f80dfa1152533976e3c112477f69274eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/191a0a1b41ed026b717421931f8d3bd2514ffbf9", - "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9", + "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", + "reference": "f640739f80dfa1152533976e3c112477f69274eb", "shasum": "" }, "require": { @@ -3394,22 +3405,22 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/master" + "source": "https://github.com/php-http/httplug/tree/2.3.0" }, - "time": "2020-07-13T15:43:23+00:00" + "time": "2022-02-21T09:52:22+00:00" }, { "name": "php-http/message", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "39eb7548be982a81085fe5a6e2a44268cd586291" + "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/39eb7548be982a81085fe5a6e2a44268cd586291", - "reference": "39eb7548be982a81085fe5a6e2a44268cd586291", + "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361", + "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361", "shasum": "" }, "require": { @@ -3426,7 +3437,7 @@ "ext-zlib": "*", "guzzlehttp/psr7": "^1.0", "laminas/laminas-diactoros": "^2.0", - "phpspec/phpspec": "^5.1 || ^6.3", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "slim/slim": "^3.0" }, "suggest": { @@ -3442,12 +3453,12 @@ } }, "autoload": { - "psr-4": { - "Http\\Message\\": "src/" - }, "files": [ "src/filters.php" - ] + ], + "psr-4": { + "Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3468,9 +3479,9 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.12.0" + "source": "https://github.com/php-http/message/tree/1.13.0" }, - "time": "2021-08-29T09:13:12+00:00" + "time": "2022-02-11T13:41:14+00:00" }, { "name": "php-http/message-factory", @@ -4803,16 +4814,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { @@ -4821,7 +4832,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -4850,7 +4861,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, "funding": [ { @@ -4866,7 +4877,7 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/error-handler", @@ -5510,16 +5521,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847" + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", "shasum": "" }, "require": { @@ -5559,7 +5570,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" }, "funding": [ { @@ -5575,7 +5586,7 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/polyfill-ctype", From 5728b8826014c6b3c075ff2a63a1e24e7365f4ea Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:17:51 +0800 Subject: [PATCH 02/41] Update ApiController.php --- app/Http/Controllers/ApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 3d307469..ff8ef693 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -165,7 +165,7 @@ class ApiController extends Controller 'Bayaran Borang', ['redirect_url' => route('pay.paymentStatus')] ); - // dd($response); + dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); if($previous_siri){ $nosiri = $previous_siri->id + 1; From 555a4b061fbc4d9659627a28ec6e543027ff0582 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:20:18 +0800 Subject: [PATCH 03/41] Update ApiController.php --- app/Http/Controllers/ApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index ff8ef693..a438761e 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -165,7 +165,7 @@ class ApiController extends Controller 'Bayaran Borang', ['redirect_url' => route('pay.paymentStatus')] ); - dd($response); + // dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); if($previous_siri){ $nosiri = $previous_siri->id + 1; @@ -174,7 +174,7 @@ class ApiController extends Controller } $billcode = $response->toArray(); - // dd($billcode); + dd($billcode); // $billcode['redirect_url'] = 'http://192.168.0.10:8003/api/pembayaran/response'; // dd($billcode); $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri); From 23059f1b730bd3815eb589a79b1d02c4696ad2b6 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:25:45 +0800 Subject: [PATCH 04/41] Update ApiController.php --- app/Http/Controllers/ApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index a438761e..ba01a026 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -153,7 +153,7 @@ class ApiController extends Controller $year = $current->format('y'); $total_bayaran = 1000; - + dd($request->email); $collection_id = $this->collection_id; $response = $bill->create( $collection_id, From 8798d0286a67d4cb98c3804cac475e80a6a647a3 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 23 Mar 2022 09:01:25 +0800 Subject: [PATCH 05/41] Update ApiController.php --- app/Http/Controllers/ApiController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index ba01a026..dce9ee99 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -61,9 +61,9 @@ class ApiController extends Controller }else{ $this->api_key = 'f3e82fe1-a422-4660-97f0-65cc59ff6c47'; $this->XSignature_Key = 'S-alZUbzmD2_TF3vmrRqgehQ'; + $this->collection_id = 'drxdyor4'; } - } public function biditem() @@ -153,7 +153,7 @@ class ApiController extends Controller $year = $current->format('y'); $total_bayaran = 1000; - dd($request->email); + $collection_id = $this->collection_id; $response = $bill->create( $collection_id, @@ -174,7 +174,7 @@ class ApiController extends Controller } $billcode = $response->toArray(); - dd($billcode); + // dd($billcode); // $billcode['redirect_url'] = 'http://192.168.0.10:8003/api/pembayaran/response'; // dd($billcode); $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri); From 92899e43ed5ed7535935d9c094b4d0a3de2a973a Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 23 Mar 2022 09:18:13 +0800 Subject: [PATCH 06/41] Update AuthController.php --- app/Http/Controllers/AuthMobile/AuthController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index 158d634c..f1c86ef2 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -14,7 +14,8 @@ use Illuminate\Support\Facades\Validator; class AuthController extends Controller { public function register(Request $request) { - $validator = Validator::make($request->all(), [ + dd($request->all); + $validator = Validator::make($request->all(), [ 'name' => 'required|string', 'username' => 'required|string|unique:users', 'nokp' => 'required|string|unique:users', From 7c4778bfcaea7e3067d3e5e56d05bf479146a102 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 23 Mar 2022 14:04:59 +0800 Subject: [PATCH 07/41] update --- app/Http/Controllers/MarhunController.php | 79 +++++++++++++---------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index bc5c882e..7fdc7b57 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -85,25 +85,19 @@ class MarhunController extends Controller // { if($request->karat != $marhun->karat) { - $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) - ->whereNull('disahkan_pada') - ->first(); - if($checkdata) - { - // - } - else - { - $karat = new Pengesahan; - $karat->lelong_id = $lelong->id; - $karat->lelongbid_id = $lelongbid->id; - $karat->lelongbidmarhun_id = $marhun->id; - $karat->norujukan = $lelongbid->norujukan; - $karat->diminta_oleh = $user->id; - $karat->diminta_pada = $currentdate; - $karat->status_ubah = 1; - $karat->save(); - } + // $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) + // ->whereNull('disahkan_pada') + // ->first(); + + $karat = new Pengesahan; + $karat->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->lelongbidmarhun_id = $marhun->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->status_ubah = 1; + $karat->save(); } $bezaberat = $marhun->berat - $request->berat_emas; $bezahargaasas = $marhun->hargaasas - $request->harga_asas; @@ -204,13 +198,14 @@ class MarhunController extends Controller $karat = new Pengesahan; $karat->lelong_id = $lelong->id; $karat->lelongbid_id = $lelongbid->id; + $karat->lelongbidmarhun_id = $lelongbidmarhun->id; $karat->norujukan = $lelongbid->norujukan; $karat->diminta_oleh = $user->id; $karat->diminta_pada = $currentdate; $karat->status_ubah = 2; $karat->save(); - return redirect()->route('marhun.show',$lelongbid->id) + return redirect()->route('marhun.show',[$lelongbid->id,$lelongbid->lelong_id]) ->with('success','Marhun Berjaya Ditambah'); } @@ -300,7 +295,7 @@ class MarhunController extends Controller ->first(); $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) - ->where('id', $pengesahan->lelongbidmarhun_id) + // ->where('id', $pengesahan->lelongbidmarhun_id) ->get()->toArray(); $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); @@ -316,19 +311,37 @@ class MarhunController extends Controller $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) ->where('norujukan', $lelongbid->norujukan) ->first(); + if($gadaimarhun) + { + $karat = $karat->where('karat', $gadaimarhun->karat)->first(); + + $total = $karat->harga * $gadaimarhun->berat; + $hargaasas = round($total); + + $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; + $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; + $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; + $marhuns[$index1]['old_harga'] = $karat->harga; + $marhuns[$index1]['old_nilaimarhun'] = $total; + $marhuns[$index1]['old_hargaasas'] = $hargaasas; + $marhuns[$index1]['status_ubah'] = $status; + } + else + { + $karat = $karat->where('karat', $marhun['karat'])->first(); + + $total = $karat->harga * $marhun['berat']; + $hargaasas = round($total); + + $marhuns[$index1]['old_marhun'] = $marhun{'marhun'}; + $marhuns[$index1]['old_karat'] = $marhun['karat']; + $marhuns[$index1]['old_berat'] = $marhun['berat']; + $marhuns[$index1]['old_harga'] = $karat->harga; + $marhuns[$index1]['old_nilaimarhun'] = $total; + $marhuns[$index1]['old_hargaasas'] = $hargaasas; + $marhuns[$index1]['status_ubah'] = $status; + } - $karat = $karat->where('karat', $gadaimarhun->karat)->first(); - - $total = $karat->harga * $gadaimarhun->berat; - $hargaasas = round($total); - - $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; - $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; - $marhuns[$index1]['old_harga'] = $karat->harga; - $marhuns[$index1]['old_nilaimarhun'] = $total; - $marhuns[$index1]['old_hargaasas'] = $hargaasas; - $marhuns[$index1]['status_ubah'] = $status; } return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id')); } From 6e707821f2c00f9d241d65e1b8e2776be3e63ebc Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 23 Mar 2022 14:09:10 +0800 Subject: [PATCH 08/41] update billplz api --- routes/api.php | 5 +---- routes/web.php | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/routes/api.php b/routes/api.php index 840818f0..bc9fa257 100644 --- a/routes/api.php +++ b/routes/api.php @@ -32,13 +32,10 @@ Route::post('/password/email', [ForgotPasswordController::class, 'sendResetLinkE // Route::get('/callback', [ApiController::class, 'feepayment']); Route::post('/feepayment', [ApiController::class, 'feepayment'])->name('feepayment'); -Route::get('/pembayaran/response', [ApiController::class, 'response'])->name('pay.paymentStatus'); -Route::get('/pembayaran/backend', [ApiController::class, 'callback'])->name('pay.callback'); + Route::post('/bidpayment', [ApiController::class, 'bidpayment'])->name('bidpayment'); -Route::get('/pembayaran/bidresponse', [ApiController::class, 'bidresponse'])->name('pay.bidpaymentStatus'); -Route::get('/pembayaran/bidbackend', [ApiController::class, 'bidbackend'])->name('pay.bidcallback'); //Protected routes Route::group(['middleware' => ['auth:sanctum']], function () { diff --git a/routes/web.php b/routes/web.php index 2dfb140b..3e980ad9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -28,6 +28,13 @@ Auth::routes(); Route::get('/home','HomeController@index')->name('home'); Route::get('/about','HomeController@about')->name('about'); +Route::get('/pembayaran/response','ApiController@response')->name('pay.paymentStatus'); +Route::get('/pembayaran/backend','ApiController@callback')->name('pay.callback'); + + +Route::get('/pembayaran/bidresponse', 'ApiController@bidresponse')->name('pay.bidpaymentStatus'); +Route::get('/pembayaran/bidbackend', 'ApiController@bidbackend')->name('pay.bidcallback'); + //Pengurusan Pengguna From ed89b0c66590f62ff9e8f44f49e2f42203b5c4b5 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 23 Mar 2022 15:35:19 +0800 Subject: [PATCH 09/41] update kemaskini marhun --- app/Http/Controllers/MarhunController.php | 32 +++++++++-------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index bc5c882e..ba53100b 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -85,25 +85,19 @@ class MarhunController extends Controller // { if($request->karat != $marhun->karat) { - $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) - ->whereNull('disahkan_pada') - ->first(); - if($checkdata) - { - // - } - else - { - $karat = new Pengesahan; - $karat->lelong_id = $lelong->id; - $karat->lelongbid_id = $lelongbid->id; - $karat->lelongbidmarhun_id = $marhun->id; - $karat->norujukan = $lelongbid->norujukan; - $karat->diminta_oleh = $user->id; - $karat->diminta_pada = $currentdate; - $karat->status_ubah = 1; - $karat->save(); - } + // $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) + // ->whereNull('disahkan_pada') + // ->first(); + + $karat = new Pengesahan; + $karat->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->lelongbidmarhun_id = $marhun->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->status_ubah = 1; + $karat->save(); } $bezaberat = $marhun->berat - $request->berat_emas; $bezahargaasas = $marhun->hargaasas - $request->harga_asas; From 81e6a5b8081d1a89b5b3601fdea7d46db3e92515 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Mar 2022 15:21:53 +0800 Subject: [PATCH 10/41] pengesahan, view marhun pengesahan mutu marhun & view details marhun --- app/Http/Controllers/MarhunController.php | 106 ++++++++++-------- .../views/pengesahan/mutumarhun.blade.php | 46 ++++---- .../pengesahan/perubahanmutumarhun.blade.php | 22 ++-- routes/web.php | 2 +- 4 files changed, 96 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ba53100b..ec2a661e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -267,69 +267,79 @@ class MarhunController extends Controller public function sahubahmutu($id) { - // dd($request->all()); + $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') ->where('lelong.id', $id) ->whereNull('disahkan_oleh') - ->select( - 'pengesahan.disahkan_oleh', - 'pengesahan.id as pengesahan_id', - 'pengesahan.norujukan', - 'lelong.id', - 'lelong.tarikh_lelong', - 'lelong.harga_emas_asas', - 'lelong.jbg', - 'lelong.cajlelong' - ) - ->get(); - - return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); - } - - public function mutumarhun($pengesahan_id, $norujukan, $id) - { - $pengesahan = Pengesahan::where('id', $pengesahan_id) - ->where('lelong_id', $id) - ->where('norujukan', $norujukan) - ->first(); - - $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) - ->where('id', $pengesahan->lelongbidmarhun_id) + ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') + ->groupBy('pengesahan.norujukan') ->get()->toArray(); - $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); - $karat = Lelkarat::where('lelong_id', $id)->get(); + // foreach($mutumarhun as $index1=>$marhun) + // { + // $pengesahan = Pengesahan::where('lelong_id', $id) + // ->where('norujukan', $marhun['norujukan']) + // ->select('id as pengesahan_id') + // ->get(); - foreach($marhuns as $index1=>$marhun) - { - $status = Pengesahan::where('id', $pengesahan_id) - ->where('lelongbid_id', $marhun['lelongbid_id']) - ->select('status_ubah') - ->value('status_ubah'); + // $mutumarhun[$index1]['pengesahan_id'] = $pengesahan; + // } - $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) - ->where('norujukan', $lelongbid->norujukan) - ->first(); + return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); - $karat = $karat->where('karat', $gadaimarhun->karat)->first(); + } - $total = $karat->harga * $gadaimarhun->berat; - $hargaasas = round($total); + public function mutumarhun($norujukan, $id) + { + $pengesahans = Pengesahan::where('lelong_id', $id) + ->where('norujukan', $norujukan) + ->get(); + + $arraypengesahan = []; + foreach($pengesahans as $pengesahan) + { + // dd($pengesahan); + $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) + ->where('id', $pengesahan->lelongbidmarhun_id) + ->get()->toArray(); + + $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); + $karat = Lelkarat::where('lelong_id', $id)->get(); + + foreach($marhuns as $index1=>$marhun) + { + $status = Pengesahan::where('id', $pengesahan->id) + ->where('lelongbid_id', $marhun['lelongbid_id']) + ->select('status_ubah') + ->value('status_ubah'); + + $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) + ->where('norujukan', $lelongbid->norujukan) + ->first(); + + $karat = $karat->where('karat', $gadaimarhun->karat)->first(); + + $total = $karat->harga * $gadaimarhun->berat; + $hargaasas = round($total); + + $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; + $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; + $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; + $marhuns[$index1]['old_harga'] = $karat->harga; + $marhuns[$index1]['old_nilaimarhun'] = $total; + $marhuns[$index1]['old_hargaasas'] = $hargaasas; + $marhuns[$index1]['status_ubah'] = $status; + } - $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; - $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; - $marhuns[$index1]['old_harga'] = $karat->harga; - $marhuns[$index1]['old_nilaimarhun'] = $total; - $marhuns[$index1]['old_hargaasas'] = $hargaasas; - $marhuns[$index1]['status_ubah'] = $status; + array_push($arraypengesahan,$marhuns); } - return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id')); + + return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraypengesahan', 'marhuns')); } public function terimaperubahan(Request $request) { - // dd($request->all()); + dd($request->all()); //update mutu marhun - gadaimarhun $user = Auth::user(); diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 33b9ff82..a7309b2b 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -6,7 +6,7 @@
@csrf - + @@ -31,52 +31,52 @@ - @foreach($marhuns as $marhun) + @foreach($arraypengesahan as $index1=>$detail) {{ $loop->iteration }} {{ $lelongbid->norujukan }} - @if($marhun['old_marhun'] != $marhun['marhun']) - {{ $marhun['old_marhun'] }} + @if($detail[0]['old_marhun'] != $detail[0]['marhun']) + {{ $detail['old_marhun'] }} @endif - {{ $marhun['marhun'] }} + {{ $detail[0]['marhun'] }} - @if($marhun['old_karat'] != $marhun['karat']) - {{ $marhun['old_karat'] }} + @if($detail[0]['old_karat'] != $detail[0]['karat']) + {{ $detail[0]['old_karat'] }} @endif - {{ $marhun['karat'] }} + {{ $detail[0]['karat'] }} - @if($marhun['old_berat'] != $marhun['berat']) - {{ number_format($marhun['old_berat'], 2, '.', '') }} + @if($detail[0]['old_berat'] != $detail[0]['berat']) + {{ number_format($detail[0]['old_berat'], 2, '.', '') }} @endif - {{ $marhun['berat'] }} + {{ $detail[0]['berat'] }} - @if($marhun['old_harga'] != $marhun['harga']) - {{ number_format($marhun['old_harga'], 2, '.', '') }} + @if($detail[0]['old_harga'] != $detail[0]['harga']) + {{ number_format($detail[0]['old_harga'], 2, '.', '') }} @endif - {{ $marhun['harga'] }} + {{ $detail[0]['harga'] }} - @if($marhun['old_nilaimarhun'] != $marhun['n_marhun']) - {{ number_format($marhun['old_nilaimarhun'], 2, '.', '') }} + @if($detail[0]['old_nilaimarhun'] != $detail[0]['n_marhun']) + {{ number_format($detail[0]['old_nilaimarhun'], 2, '.', '') }} @endif - {{ $marhun['n_marhun'] }} + {{ $detail[0]['n_marhun'] }} - @if($marhun['old_hargaasas'] != $marhun['hargaasas']) - {{ number_format($marhun['old_hargaasas'], 2, '.', '') }} + @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) + {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} @endif - {{ $marhun['hargaasas'] }} + {{ $detail[0]['hargaasas'] }} - @if($marhun['status_ubah'] == 1) + @if($detail[0]['status_ubah'] == 1) - @elseif($marhun['status_ubah'] == 2) + @elseif($detail[0]['status_ubah'] == 2) - @elseif($marhun['status_ubah'] == 3) + @elseif($detail[0]['status_ubah'] == 3) @endif diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index e61b1b5e..2e9413e6 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -15,22 +15,28 @@ Bil No Rujukan - - JBG - Caj Lelong + Status Action @foreach($mutumarhun as $marhun) - {{ $loop->iteration }} + {{ $marhun['norujukan'] }} - {{ $marhun['harga_emas_asas'] }} - {{ $marhun['jbg'] }} - {{ $marhun['cajlelong'] }} - + @if($marhun['total'] === intval($marhun['tstat'])) + + @else + + @endif + + + @if($marhun['total'] !== intval($marhun['tstat'])) + + @else + + @endif @endforeach diff --git a/routes/web.php b/routes/web.php index 2dfb140b..6be473f8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -157,7 +157,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { Route::get('/senarailelongubahmutu',['as'=>'pengesahan.senarailelongubahmutu','uses'=>'MarhunController@senarailelongubahmutu']); Route::get('/perubahanmutumarhun/{id}',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']); - Route::get('/mutumarhun/{pengesahan_id}/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); + Route::get('/mutumarhun/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']); Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']); From 94def3b631b3532e8a26382a791dbcba962dae1d Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 24 Mar 2022 16:33:56 +0800 Subject: [PATCH 11/41] Update listnotis_excel.blade.php --- resources/views/excel/listnotis_excel.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php index 8e985d83..d0723604 100644 --- a/resources/views/excel/listnotis_excel.blade.php +++ b/resources/views/excel/listnotis_excel.blade.php @@ -77,7 +77,7 @@ {{ $loop->iteration }} {{ $pay['nama']}} {{ $pay['norujukan']}} - {{ $pay['telefon']}} + 6{{ $pay['telefon']}} {{ $pay['jbg']}} {{ $pay['nokp']}} {{ $pay['pinjaman']}} From 221d1df36e4b5859f6d81b6d56d47aa2f6a8bcba Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Thu, 24 Mar 2022 22:34:37 +0800 Subject: [PATCH 12/41] update new function --- app/Http/Controllers/ApiController.php | 4 + resources/views/includes/sidebar.blade.php | 3 + .../views/pembayaran/testbillplz.blade.php | 74 +++++++++++++++++++ routes/web.php | 5 ++ 4 files changed, 86 insertions(+) create mode 100644 resources/views/pembayaran/testbillplz.blade.php diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index dce9ee99..1b712db6 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -126,6 +126,10 @@ class ApiController extends Controller } } + public function testbillplz() + { + return view('pembayaran.testbillplz'); + } public function feepayment(Request $request) { diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index a768e1e7..7c2f5f01 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -33,6 +33,9 @@
  • Pengurusan Database
    • +
  • + Testing billplz +
    • {{--
  • Portfolio
    • diff --git a/resources/views/pembayaran/testbillplz.blade.php b/resources/views/pembayaran/testbillplz.blade.php new file mode 100644 index 00000000..323a0daf --- /dev/null +++ b/resources/views/pembayaran/testbillplz.blade.php @@ -0,0 +1,74 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + @csrf +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    + {{-- --}} + {{-- Kembali --}} + +
    + + + {{-- --}} +
    +
    +
    + +@endsection diff --git a/routes/web.php b/routes/web.php index 3e980ad9..9ae74ef5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -83,6 +83,11 @@ Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], functio Route::post('/export',['as'=>'sistem.export','uses'=>'DatabaseController@export']); }); +Route::group(['middleware','prefix'=>'payment'], function () { + Route::get('/testbillplz',['as'=>'payment.testbillplz','uses'=>'ApiController@testbillplz']); + Route::post('/payment',['as'=>'payment.feepayment','uses'=>'ApiController@feepayment']); +}); + Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:pendaftaranbatch']], function () { Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); From c8d3d34e627940ecb8c593e269c2b0e409b19450 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Fri, 25 Mar 2022 00:56:31 +0800 Subject: [PATCH 13/41] Update ApiController.php --- app/Http/Controllers/ApiController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 1b712db6..b70ca632 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -194,7 +194,11 @@ class ApiController extends Controller $resit->save(); - return redirect($billcode['url'] . '?auto_submit=true'); + // return redirect($billcode['url'] . '?auto_submit=true'); + return response()->json([ + 'success' => true, + 'message' => $billcode['url'], + ], 401); // return view('pembayaran.result.berjaya',compact('arraybayaran')); } From 0b4f516f61abdf1309f18af27b74c3ffc2741d25 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Fri, 25 Mar 2022 01:13:42 +0800 Subject: [PATCH 14/41] Update ApiController.php --- app/Http/Controllers/ApiController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index b70ca632..f843a271 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -376,8 +376,11 @@ class ApiController extends Controller $resit->save(); - return redirect($billcode['url'] . '?auto_submit=true'); - + // return redirect($billcode['url'] . '?auto_submit=true'); + return response()->json([ + 'success' => true, + 'message' => $billcode['url'], + ], 401); // return view('pembayaran.result.berjaya',compact('arraybayaran')); } From d1ef9b7e0c3209528476c22180f3995a57a473b0 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:20:06 +0800 Subject: [PATCH 15/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 6b498ffb..a09a4141 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -72,8 +72,12 @@ class LelongMobileController extends Controller public function bidderSelectBidItem(Request $request){ - $feepayment = Payment::where('lelong_id', '=', $request->lelong_id)->first(); - + $feepayment = Payment::join('resit', 'payment.resit_id','=','resit.id') + ->where('payment.user_id',$request->user_id) + ->where('lelong_id', '=', $request->lelong_id) + ->where('resit.resit_type',3) + ->where('resit.status','PAID')->first(); + dd($feepayment); if($feepayment != null){ $user = User::where('id', '=', $request->user_id) @@ -90,7 +94,7 @@ class LelongMobileController extends Controller 'carts.hargabida', 'carts.id as cart_id') ->get(); - + dd($carts); // dd($selectBid[0]->hargabida); $currentdate = Carbon::now()->toDateTimeString(); From f6c7d9076561155640bdc2fb87a1a7d4aa4cf44c Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Fri, 25 Mar 2022 22:13:40 +0800 Subject: [PATCH 16/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index a09a4141..5d99f13e 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -74,10 +74,10 @@ class LelongMobileController extends Controller $feepayment = Payment::join('resit', 'payment.resit_id','=','resit.id') ->where('payment.user_id',$request->user_id) - ->where('lelong_id', '=', $request->lelong_id) - ->where('resit.resit_type',3) + ->where('payment.lelong_id', '=', $request->lelong_id) + ->where('resit.resit_type',1) ->where('resit.status','PAID')->first(); - dd($feepayment); + // dd($feepayment); if($feepayment != null){ $user = User::where('id', '=', $request->user_id) From 981a95b55de41f7a968cb650a69ee6bedb349228 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Fri, 25 Mar 2022 22:19:06 +0800 Subject: [PATCH 17/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 5d99f13e..40299415 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -94,7 +94,7 @@ class LelongMobileController extends Controller 'carts.hargabida', 'carts.id as cart_id') ->get(); - dd($carts); + // dd($carts); // dd($selectBid[0]->hargabida); $currentdate = Carbon::now()->toDateTimeString(); From 43b873a9e648fe883e7790e1493b42212e9786a3 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:20:55 +0800 Subject: [PATCH 18/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 40299415..3d557bd0 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -227,6 +227,7 @@ class LelongMobileController extends Controller $lelongbid = LelongBid::whereIn('norujukan',$request->norujukan) ->where('lelong_id',$request->lelong_id) + ->where('user_id',$request->user_id) ->get(); foreach($lelongbid as $bid) From 25c9b495597f7555341ae01f04bae58113379776 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:33:21 +0800 Subject: [PATCH 19/41] Update PaymentController.php --- app/Http/Controllers/PaymentController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 057ce3fe..f83a0e4f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -170,6 +170,7 @@ class PaymentController extends Controller $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) + ->where('user_id',$request->user_id) ->first(); $updatelelbidbidder->status_payment = 1; $updatelelbidbidder->payment_id = $payment->id; From 803fd7295adb747f12487650fe9f20810038aaa4 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:37:49 +0800 Subject: [PATCH 20/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 3d557bd0..d8198fee 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -269,7 +269,8 @@ class LelongMobileController extends Controller { // dd($lelong['id']); $datalelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbid.lelong_id',$lelong['id'])->get(); + ->where('lelongbid.lelong_id',$lelong['id']) + where('user_id',$user_id)->get(); $payment = Payment::join('resit', 'payment.resit_id', '=', 'resit.id') ->where('payment.lelong_id',$lelong['id']) From 1f2251f458745d95c65acfc98ab397a0c148ca3b Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:39:19 +0800 Subject: [PATCH 21/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index d8198fee..f892c8f4 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -270,7 +270,7 @@ class LelongMobileController extends Controller // dd($lelong['id']); $datalelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbid.lelong_id',$lelong['id']) - where('user_id',$user_id)->get(); + ->where('user_id',$user_id)->get(); $payment = Payment::join('resit', 'payment.resit_id', '=', 'resit.id') ->where('payment.lelong_id',$lelong['id']) From bed4696126a4edeec35d89490b756d431becf14a Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:41:45 +0800 Subject: [PATCH 22/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index f892c8f4..35c409c6 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -270,7 +270,8 @@ class LelongMobileController extends Controller // dd($lelong['id']); $datalelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbid.lelong_id',$lelong['id']) - ->where('user_id',$user_id)->get(); + ->where('user_id',$user_id) + ->where('status_bidder',1)->get(); $payment = Payment::join('resit', 'payment.resit_id', '=', 'resit.id') ->where('payment.lelong_id',$lelong['id']) From bb813f4a4230f4dc29f82863dac88a8a859c1c24 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 00:24:38 +0800 Subject: [PATCH 23/41] update --- app/Http/Controllers/ApiController.php | 8 ++++---- app/Http/Controllers/AuthMobile/AuthController.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index f843a271..188b8b37 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -156,7 +156,7 @@ class ApiController extends Controller $month = $current->month; $year = $current->format('y'); - $total_bayaran = 1000; + $total_bayaran = 1100; $collection_id = $this->collection_id; $response = $bill->create( @@ -190,7 +190,7 @@ class ApiController extends Controller $resit->reference_no = $reference_no; $resit->billplz_id = $billcode['id']; $resit->resit_type = 1; - $resit->total_payment = 10; + $resit->total_payment = 11; $resit->save(); @@ -338,7 +338,7 @@ class ApiController extends Controller $month = $current->month; $year = $current->format('y'); - $total_bayaran = ($request->total)*100; + $total_bayaran = ($request->total)*100+100; $collection_id = $this->collection_id; $response = $bill->create( @@ -372,7 +372,7 @@ class ApiController extends Controller $resit->reference_no = $reference_no; $resit->billplz_id = $billcode['id']; $resit->resit_type = 3; //billplz resit for bid payment - $resit->total_payment = $request->total; + $resit->total_payment = $request->total+1; $resit->save(); diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index f1c86ef2..fa9a6b24 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Validator; class AuthController extends Controller { public function register(Request $request) { - dd($request->all); + // dd($request->all); $validator = Validator::make($request->all(), [ 'name' => 'required|string', 'username' => 'required|string|unique:users', From aeff11e4d8386d1344cca4175fd2250eac835554 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 00:38:57 +0800 Subject: [PATCH 24/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 35c409c6..2348de63 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -227,12 +227,12 @@ class LelongMobileController extends Controller $lelongbid = LelongBid::whereIn('norujukan',$request->norujukan) ->where('lelong_id',$request->lelong_id) - ->where('user_id',$request->user_id) ->get(); foreach($lelongbid as $bid) { - $lelongbidder = LelongBidder::where('lelongbid_id',$bid->id)->first(); + $lelongbidder = LelongBidder::where('lelongbid_id',$bid->id) + ->where('user_id',$request->user_id)->first(); $lelongbidder->status_payment =1; $lelongbidder->payment_id = $request->paymentid; $lelongbidder->save(); From 647e26ae35f7c2c40afb79716ec881ab967e8c1f Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 01:29:51 +0800 Subject: [PATCH 25/41] payment --- app/Http/Controllers/ApiController.php | 4 ++-- .../Mobile/LelongMobileController.php | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 188b8b37..64cc1718 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -233,7 +233,7 @@ class ApiController extends Controller $payment->resit_id = $resit->id; $payment->status_payment_opt = 2; //bayar secara online 2 $payment->status = 1; //fee rm10 - 1 - $payment->remark = 'Bayaran Online'; + $payment->remark = 'BAYARAN ONLINE'; $payment->save(); event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); @@ -288,7 +288,7 @@ class ApiController extends Controller $payment->resit_id = $resit->id; $payment->status_payment_opt = 2; //bayar secara online 2 $payment->status = 1; //fee rm10 - 1 - $payment->remark = 'Bayaran Online'; + $payment->remark = 'BAYARAN ONLINE'; $payment->save(); event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 2348de63..9ebe0581 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -242,7 +242,26 @@ class LelongMobileController extends Controller $lelongbid->t_jual = $currentdate; $lelongbid->hargajual = $lelongbidder->hargabida; $lelongbid->save(); + } + + $alllelongbidder = LelongBidder::join('lelongbid','lelongbidder.lelongbid_id','lelongbid.id') + ->where('lelongbidder.user_id',$request->user_id) + ->where('lelongbid.lelong_id',$request->lelong_id) + ->get(); + + $resit = Resit::where('lelong_id',$request->lelong_id) + ->where('user_id',$request->user_id) + ->where('resit_type',2) + ->first(); + + if($resit->total_payment > $alllelongbidder->SUM('lelongbidder.hargabida')) + { + $resit->status = 'PAID'; + $resit->paid_at = $currentdate; + $resit->save(); + } + $response = [ 'success' => "success", 'message' => "Bidaan berjaya dibayar" From 00feff39499750185f6501c9ba27c46cfe875b9b Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 09:48:00 +0800 Subject: [PATCH 26/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 9ebe0581..d9163b78 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -14,6 +14,7 @@ use App\Models\Payment; use App\Models\Cart; use Carbon\Carbon; use App\Models\Cawangan; +use App\Models\Resit; class LelongMobileController extends Controller { From c64264e6186c7706f74a8944e28c32cf142fcc1d Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 11:03:36 +0800 Subject: [PATCH 27/41] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index d9163b78..88b8a4be 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -249,6 +249,8 @@ class LelongMobileController extends Controller $alllelongbidder = LelongBidder::join('lelongbid','lelongbidder.lelongbid_id','lelongbid.id') ->where('lelongbidder.user_id',$request->user_id) ->where('lelongbid.lelong_id',$request->lelong_id) + ->where('lelongbidder.status_bidder',1) + ->select('lelongbidder.hargabida') ->get(); $resit = Resit::where('lelong_id',$request->lelong_id) @@ -256,7 +258,7 @@ class LelongMobileController extends Controller ->where('resit_type',2) ->first(); - if($resit->total_payment > $alllelongbidder->SUM('lelongbidder.hargabida')) + if($resit->total_payment > $alllelongbidder->SUM('hargabida')) { $resit->status = 'PAID'; $resit->paid_at = $currentdate; From 6c7a483eda9f3cb69ec81b95f78e6fcb1329c8b9 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 12:36:59 +0800 Subject: [PATCH 28/41] update --- app/Http/Controllers/AccountController.php | 18 +++-------- .../Mobile/LelongMobileController.php | 32 +++++++++---------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 92793e95..034332ff 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -137,27 +137,19 @@ class AccountController extends Controller 'lelongbidder.user_id', ) ->get(); - $total_payment = 0; foreach($senaraisag as $sag) { - $payment = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id') - ->where('payment.lelong_id', $request->lelong_id) - ->where('payment.user_id', $request->user_id) - // ->where('lelongbidder.lelongbid_id', $sag->lelongbid_id) - ->first(); - - // dd($payment); - + $payment = Payment::where('id', $sag->payment_id)->first(); $payment->disahkan_oleh = $user->id; $payment->disahkan_pada = $currentdate; $payment->save(); $total_payment = $total_payment + $payment->total_payment; - $updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) - ->first(); - $updatelelbidbidder->status_payment = 1; - $updatelelbidbidder->save(); + // $updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) + // ->first(); + // $updatelelbidbidder->status_payment = 1; + // $updatelelbidbidder->save(); $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first(); $eachbid->status_payment = 1; diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 88b8a4be..02e700da 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -246,24 +246,24 @@ class LelongMobileController extends Controller } - $alllelongbidder = LelongBidder::join('lelongbid','lelongbidder.lelongbid_id','lelongbid.id') - ->where('lelongbidder.user_id',$request->user_id) - ->where('lelongbid.lelong_id',$request->lelong_id) - ->where('lelongbidder.status_bidder',1) - ->select('lelongbidder.hargabida') - ->get(); + // $alllelongbidder = LelongBidder::join('lelongbid','lelongbidder.lelongbid_id','lelongbid.id') + // ->where('lelongbidder.user_id',$request->user_id) + // ->where('lelongbid.lelong_id',$request->lelong_id) + // ->where('lelongbidder.status_bidder',1) + // ->select('lelongbidder.hargabida') + // ->get(); - $resit = Resit::where('lelong_id',$request->lelong_id) - ->where('user_id',$request->user_id) - ->where('resit_type',2) - ->first(); + // $resit = Resit::where('lelong_id',$request->lelong_id) + // ->where('user_id',$request->user_id) + // ->where('resit_type',2) + // ->first(); - if($resit->total_payment > $alllelongbidder->SUM('hargabida')) - { - $resit->status = 'PAID'; - $resit->paid_at = $currentdate; - $resit->save(); - } + // if($resit->total_payment > $alllelongbidder->SUM('hargabida')) + // { + // $resit->status = 'PAID'; + // $resit->paid_at = $currentdate; + // $resit->save(); + // } $response = [ 'success' => "success", From f13234ad8a586fecaea4205b797f4c438eedfc02 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 12:55:35 +0800 Subject: [PATCH 29/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 034332ff..2298f112 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -124,6 +124,7 @@ class AccountController extends Controller $user = Auth::user(); + $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id') ->where('lelongbid.lelong_id', $request->lelong_id) @@ -136,27 +137,27 @@ class AccountController extends Controller 'lelongbid.lelong_id', 'lelongbidder.user_id', ) - ->get(); + ->get(); + $total_payment = 0; - foreach($senaraisag as $sag) + $paymentid = $senaraisag->groupBy('payment_id'); + + foreach($paymentid as $id) { - $payment = Payment::where('id', $sag->payment_id)->first(); + $payment = Payment::where('id', $id->payment_id)->first(); $payment->disahkan_oleh = $user->id; $payment->disahkan_pada = $currentdate; $payment->save(); $total_payment = $total_payment + $payment->total_payment; - // $updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) - // ->first(); - // $updatelelbidbidder->status_payment = 1; - // $updatelelbidbidder->save(); - + } + foreach($senaraisag as $sag) + { $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first(); $eachbid->status_payment = 1; $eachbid->status_jual = 1; $eachbid->t_jual = $currentdate; $eachbid->save(); - } $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') From e98306736f27ba6c2797415087a09f7a1000f281 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:20:26 +0800 Subject: [PATCH 30/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 2298f112..48aef742 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -105,13 +105,20 @@ class AccountController extends Controller ->where('payment.status_payment_opt', 2) ->get()->toArray(); - $total_payment = 0; - foreach($senaraisag as $index1=>$sagbid){ + $saggroupbyid = $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id') + ->where('lelongbid.lelong_id', $request->lelong_id) + ->where('lelongbidder.user_id', $request->user_id) + ->where('lelongbidder.status_bidder', 1) + ->where('payment.status_payment_opt', 2) + ->select( + 'payment.id as payment_id' + ) + ->groupBy('payment_id') + ->get(); - if($sagbid['total_payment']){ - $total_payment = $total_payment +$sagbid['total_payment']; - } - } + $total_payment = $saggroupbyid->sum('payment.total_payment'); + return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment')); } From 48de31142f0c5091c71eca513fe116bfb8ded9c0 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:22:20 +0800 Subject: [PATCH 31/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 48aef742..29462e3f 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -105,10 +105,10 @@ class AccountController extends Controller ->where('payment.status_payment_opt', 2) ->get()->toArray(); - $saggroupbyid = $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id') - ->where('lelongbid.lelong_id', $request->lelong_id) - ->where('lelongbidder.user_id', $request->user_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) ->where('lelongbidder.status_bidder', 1) ->where('payment.status_payment_opt', 2) ->select( From 71bad42f7ba4a044314c805e2929934f25532e48 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:26:21 +0800 Subject: [PATCH 32/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 29462e3f..a2e83303 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -112,9 +112,9 @@ class AccountController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('payment.status_payment_opt', 2) ->select( - 'payment.id as payment_id' + 'lelongbid.payment_id as payment_id' ) - ->groupBy('payment_id') + ->groupBy('lelongbid.payment_id') ->get(); $total_payment = $saggroupbyid->sum('payment.total_payment'); From 99965abafafb0a0ce36e95a59c1710284e08e19f Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:27:43 +0800 Subject: [PATCH 33/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index a2e83303..d697b11b 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -112,9 +112,9 @@ class AccountController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('payment.status_payment_opt', 2) ->select( - 'lelongbid.payment_id as payment_id' + 'lelongbidder.payment_id as payment_id' ) - ->groupBy('lelongbid.payment_id') + ->groupBy('lelongbidder.payment_id') ->get(); $total_payment = $saggroupbyid->sum('payment.total_payment'); From 5dc21ec80b738047037702dbfed41695bd4260e1 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:30:54 +0800 Subject: [PATCH 34/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index d697b11b..0b90dbda 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -113,11 +113,12 @@ class AccountController extends Controller ->where('payment.status_payment_opt', 2) ->select( 'lelongbidder.payment_id as payment_id' + 'payment.total_payment as total_payment' ) ->groupBy('lelongbidder.payment_id') ->get(); - $total_payment = $saggroupbyid->sum('payment.total_payment'); + $total_payment = $saggroupbyid->sum('total_payment'); return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment')); From f0b3966c7ab27ce14cf7703fa0da2302cca51584 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:36:59 +0800 Subject: [PATCH 35/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 0b90dbda..b8770e13 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -113,12 +113,11 @@ class AccountController extends Controller ->where('payment.status_payment_opt', 2) ->select( 'lelongbidder.payment_id as payment_id' - 'payment.total_payment as total_payment' ) ->groupBy('lelongbidder.payment_id') ->get(); - - $total_payment = $saggroupbyid->sum('total_payment'); + // $payments = Payment::whereIn($saggroupbyid)->get() + $total_payment = Payment::whereIn($saggroupbyid)->get()->sum('total_payment'); return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment')); From 4c357b7e6491bab4ddba3078b33beca6ada440b7 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:41:33 +0800 Subject: [PATCH 36/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b8770e13..5958dabe 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -147,11 +147,21 @@ class AccountController extends Controller ->get(); $total_payment = 0; - $paymentid = $senaraisag->groupBy('payment_id'); + $paymentid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id') + ->where('lelongbid.lelong_id', $request->lelong_id) + ->where('lelongbidder.user_id', $request->user_id) + ->where('lelongbidder.status_bidder', 1) + ->where('payment.status_payment_opt', 2) + ->select( + 'lelongbidder.payment_id as payment_id' + ) + ->groupBy('lelongbidder.payment_id') + ->get(); - foreach($paymentid as $id) + foreach($paymentid as $dataid) { - $payment = Payment::where('id', $id->payment_id)->first(); + $payment = Payment::where('id', $dataid->payment_id)->first(); $payment->disahkan_oleh = $user->id; $payment->disahkan_pada = $currentdate; $payment->save(); From 21b0272347405a210451aae1cdcb3002740217bb Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:50:44 +0800 Subject: [PATCH 37/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 5958dabe..7ffdab83 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -115,9 +115,9 @@ class AccountController extends Controller 'lelongbidder.payment_id as payment_id' ) ->groupBy('lelongbidder.payment_id') - ->get(); + ->get(); // $payments = Payment::whereIn($saggroupbyid)->get() - $total_payment = Payment::whereIn($saggroupbyid)->get()->sum('total_payment'); + $total_payment = Payment::whereIn('id',$saggroupbyid)->get()->sum('total_payment'); return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment')); From a95df95370e61d7ba8e0aab25de76093cb695af7 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:27:23 +0800 Subject: [PATCH 38/41] update --- app/Http/Controllers/AccountController.php | 11 +++-------- app/Http/Controllers/ApiController.php | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 7ffdab83..28d4e0da 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -32,17 +32,12 @@ class AccountController extends Controller public function listbayaranonline($lelong_id){ - // $listwinner = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id') - // ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id') - // ->where('lelongbidder.status_bidder', 1) - // ->where('lelongbid.lelong_id', $lelong_id) - // ->select('payment.user_id' - // ) - // ->groupBy('payment.user_id') - // ->get(); + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('payment', 'lelongbidder.payment_id', 'payment.id') ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) + ->where('payment.status_payment_opt',2) ->select('.lelongbidder.user_id' ) ->groupBy('lelongbidder.user_id') diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 64cc1718..a1b8c90e 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -190,7 +190,7 @@ class ApiController extends Controller $resit->reference_no = $reference_no; $resit->billplz_id = $billcode['id']; $resit->resit_type = 1; - $resit->total_payment = 11; + $resit->total_payment = 10; $resit->save(); @@ -372,7 +372,7 @@ class ApiController extends Controller $resit->reference_no = $reference_no; $resit->billplz_id = $billcode['id']; $resit->resit_type = 3; //billplz resit for bid payment - $resit->total_payment = $request->total+1; + $resit->total_payment = $request->total; $resit->save(); From f4b25453424a6aa830a9196249d2f4bceef10d38 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:30:27 +0800 Subject: [PATCH 39/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 28d4e0da..c5d78b7e 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -38,6 +38,7 @@ class AccountController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('payment.status_payment_opt',2) + ->whereNotNull('payment.disahkan_pada') ->select('.lelongbidder.user_id' ) ->groupBy('lelongbidder.user_id') From 229412e7a47f2e86f25d948b7d207f1c31766d7f Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:32:45 +0800 Subject: [PATCH 40/41] Update AccountController.php --- app/Http/Controllers/AccountController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index c5d78b7e..3c9711d7 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -38,7 +38,7 @@ class AccountController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('payment.status_payment_opt',2) - ->whereNotNull('payment.disahkan_pada') + ->whereNull('payment.disahkan_pada') ->select('.lelongbidder.user_id' ) ->groupBy('lelongbidder.user_id') From 691a32a94dfbcb8fe734d0dae6545bc1102e3a6c Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:30:59 +0800 Subject: [PATCH 41/41] Update kaunterpembayaran.blade.php --- resources/views/pembayaran/kaunterpembayaran.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index 98e1c0ea..948aa547 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -19,7 +19,7 @@ No Telefon Bilangan Surat Jumlah Bidaan(RM) - Jumlah Pembayaran(RM) + Amaun Telah Dibayar(RM) Penyata Bayaran Action