diff --git a/composer.lock b/composer.lock
index 30435d7da..acb285548 100644
--- a/composer.lock
+++ b/composer.lock
@@ -413,16 +413,16 @@
},
{
"name": "akaunting/laravel-money",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/akaunting/laravel-money.git",
- "reference": "a4a3a204250a1185080c9cf0fe6f7f50d0e144cf"
+ "reference": "daf8ca8dc91b5a08d31dbf0788e2a4723185451f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/a4a3a204250a1185080c9cf0fe6f7f50d0e144cf",
- "reference": "a4a3a204250a1185080c9cf0fe6f7f50d0e144cf",
+ "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/daf8ca8dc91b5a08d31dbf0788e2a4723185451f",
+ "reference": "daf8ca8dc91b5a08d31dbf0788e2a4723185451f",
"shasum": ""
},
"require": {
@@ -475,9 +475,9 @@
],
"support": {
"issues": "https://github.com/akaunting/laravel-money/issues",
- "source": "https://github.com/akaunting/laravel-money/tree/3.1.0"
+ "source": "https://github.com/akaunting/laravel-money/tree/3.1.1"
},
- "time": "2022-07-19T11:23:57+00:00"
+ "time": "2022-07-20T09:28:53+00:00"
},
{
"name": "akaunting/laravel-mutable-observer",
@@ -907,16 +907,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.231.8",
+ "version": "3.231.9",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "99b3e4585ac82a6e9ab6d1944d90231456fefbea"
+ "reference": "fbda3e544226b44f79ead89de78f220d30ef3796"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/99b3e4585ac82a6e9ab6d1944d90231456fefbea",
- "reference": "99b3e4585ac82a6e9ab6d1944d90231456fefbea",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbda3e544226b44f79ead89de78f220d30ef3796",
+ "reference": "fbda3e544226b44f79ead89de78f220d30ef3796",
"shasum": ""
},
"require": {
@@ -993,9 +993,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.231.8"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.231.9"
},
- "time": "2022-07-18T18:20:47+00:00"
+ "time": "2022-07-19T18:14:37+00:00"
},
{
"name": "balping/json-raw-encoder",
@@ -4473,16 +4473,16 @@
},
{
"name": "laravel/framework",
- "version": "v9.20.0",
+ "version": "v9.21.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "c99868f1c9bf2f5d250993121838db905591864f"
+ "reference": "a8a529d371faaa38bde087aa6171a5b53a6a8760"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/c99868f1c9bf2f5d250993121838db905591864f",
- "reference": "c99868f1c9bf2f5d250993121838db905591864f",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/a8a529d371faaa38bde087aa6171a5b53a6a8760",
+ "reference": "a8a529d371faaa38bde087aa6171a5b53a6a8760",
"shasum": ""
},
"require": {
@@ -4497,6 +4497,7 @@
"league/flysystem": "^3.0.16",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.53.1",
+ "nunomaduro/termwind": "^1.13",
"php": "^8.0.2",
"psr/container": "^1.1.1|^2.0.1",
"psr/log": "^1.0|^2.0|^3.0",
@@ -4648,7 +4649,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2022-07-13T13:26:22+00:00"
+ "time": "2022-07-19T14:12:19+00:00"
},
{
"name": "laravel/sanctum",
@@ -6758,6 +6759,92 @@
},
"time": "2022-05-31T20:59:12+00:00"
},
+ {
+ "name": "nunomaduro/termwind",
+ "version": "v1.13.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nunomaduro/termwind.git",
+ "reference": "132a24bd3e8c559e7f14fa14ba1b83772a0f97f8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/132a24bd3e8c559e7f14fa14ba1b83772a0f97f8",
+ "reference": "132a24bd3e8c559e7f14fa14ba1b83772a0f97f8",
+ "shasum": ""
+ },
+ "require": {
+ "ext-mbstring": "*",
+ "php": "^8.0",
+ "symfony/console": "^5.3.0|^6.0.0"
+ },
+ "require-dev": {
+ "ergebnis/phpstan-rules": "^1.0.",
+ "illuminate/console": "^8.0|^9.0",
+ "illuminate/support": "^8.0|^9.0",
+ "laravel/pint": "^0.2.0",
+ "pestphp/pest": "^1.21.0",
+ "pestphp/pest-plugin-mock": "^1.0",
+ "phpstan/phpstan": "^1.4.6",
+ "phpstan/phpstan-strict-rules": "^1.1.0",
+ "symfony/var-dumper": "^5.2.7|^6.0.0",
+ "thecodingmachine/phpstan-strict-rules": "^1.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Termwind\\Laravel\\TermwindServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/Functions.php"
+ ],
+ "psr-4": {
+ "Termwind\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }
+ ],
+ "description": "Its like Tailwind CSS, but for the console.",
+ "keywords": [
+ "cli",
+ "console",
+ "css",
+ "package",
+ "php",
+ "style"
+ ],
+ "support": {
+ "issues": "https://github.com/nunomaduro/termwind/issues",
+ "source": "https://github.com/nunomaduro/termwind/tree/v1.13.0"
+ },
+ "funding": [
+ {
+ "url": "https://www.paypal.com/paypalme/enunomaduro",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/nunomaduro",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/xiCO2k",
+ "type": "github"
+ }
+ ],
+ "time": "2022-07-01T15:06:55+00:00"
+ },
{
"name": "omnipay/common",
"version": "v3.2.0",
@@ -14129,5 +14216,5 @@
"ext-zip": "*"
},
"platform-dev": [],
- "plugin-api-version": "2.2.0"
+ "plugin-api-version": "2.3.0"
}
diff --git a/resources/assets/js/views/common/items.js b/resources/assets/js/views/common/items.js
index f05a351b9..819a67e0e 100644
--- a/resources/assets/js/views/common/items.js
+++ b/resources/assets/js/views/common/items.js
@@ -106,6 +106,7 @@ const app = new Vue({
}
this.sale_information = true;
+ this.form.sale_price = '';
} else {
if (! this.form.sale_information) {
this.sale_information = false;
@@ -113,6 +114,7 @@ const app = new Vue({
}
this.purchase_information = true;
+ this.form.purchase_price = '';
}
}
},
diff --git a/resources/lang/en-GB/transfers.php b/resources/lang/en-GB/transfers.php
index f085ac82c..46b4238d6 100644
--- a/resources/lang/en-GB/transfers.php
+++ b/resources/lang/en-GB/transfers.php
@@ -2,15 +2,16 @@
return [
- 'from_account' => 'From',
+ 'details' => 'Detail|Details',
+
+ 'from_account' => 'From Account',
'to_account' => 'To Account',
'from_rate' => 'From Rate',
- 'from_account_rate' => 'From Account Rate',
'to_rate' => 'To Rate',
+ 'from_account_rate' => 'From Account Rate',
'to_account_rate' => 'To Account Rate',
- 'from_amount' => 'From',
+ 'from_amount' => 'From Amount',
'to_amount' => 'To Amount',
- 'details' => 'Detail|Details',
'issued_at' => 'Issue Date',
'rate' => 'Rate',
diff --git a/resources/views/components/dropdown/link.blade.php b/resources/views/components/dropdown/link.blade.php
index 77fdb5883..d49b96e5f 100644
--- a/resources/views/components/dropdown/link.blade.php
+++ b/resources/views/components/dropdown/link.blade.php
@@ -1,4 +1,4 @@
-
+
{!! $slot !!}