diff --git a/VERSION.txt b/VERSION.txt
index cfa0f5628fd1..7d908497ecd1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.0.42
\ No newline at end of file
+5.0.43
\ No newline at end of file
diff --git a/app/Http/Requests/ClientPortal/StoreDocumentRequest.php b/app/Http/Requests/ClientPortal/StoreDocumentRequest.php
index 3294abcd48fb..93b5ea17cb9f 100644
--- a/app/Http/Requests/ClientPortal/StoreDocumentRequest.php
+++ b/app/Http/Requests/ClientPortal/StoreDocumentRequest.php
@@ -29,7 +29,7 @@ class StoreDocumentRequest extends Request
public function rules()
{
return [
- 'file' => 'required|max:10000|mimes:png,svg,jpeg,gif,jpg,bmp',
+ 'file' => 'required|max:10000|mimes:png,svg,jpeg,gif,jpg,bmp,txt,doc,docx,xls,xlsx,pdf',
];
}
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 54b9929d62c9..e09503cb7519 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -46,7 +46,6 @@ class Client extends BaseModel implements HasLocalePreference
protected $fillable = [
'assigned_user_id',
- 'currency_id',
'name',
'website',
'private_notes',
diff --git a/config/ninja.php b/config/ninja.php
index feaee9ea60cc..22c4e172d22d 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -12,7 +12,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
- 'app_version' => '5.0.42',
+ 'app_version' => '5.0.43',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),
diff --git a/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php b/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php
index bd17fcbf358f..2b4d0e415230 100644
--- a/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php
+++ b/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php
@@ -16,7 +16,10 @@ class UpdateCanadianDollarSymbol extends Migration
*/
public function up()
{
- Currency::find(9)->update(['symbol' => '$']);
+ $currency = Currency::find(9);
+
+ if($currency)
+ $currency->update(['symbol' => '$']);
$this->buildCache(true);
}
diff --git a/database/seeders/CurrenciesSeeder.php b/database/seeders/CurrenciesSeeder.php
index f34b0a6fad0a..f0901e49276c 100644
--- a/database/seeders/CurrenciesSeeder.php
+++ b/database/seeders/CurrenciesSeeder.php
@@ -30,7 +30,7 @@ class CurrenciesSeeder extends Seeder
['id' => 6, 'name' => 'Israeli Shekel', 'code' => 'ILS', 'symbol' => 'NIS ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['id' => 7, 'name' => 'Swedish Krona', 'code' => 'SEK', 'symbol' => 'kr', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ',', 'swap_currency_symbol' => true],
['id' => 8, 'name' => 'Kenyan Shilling', 'code' => 'KES', 'symbol' => 'KSh ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
- ['id' => 9, 'name' => 'Canadian Dollar', 'code' => 'CAD', 'symbol' => 'C$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+ ['id' => 9, 'name' => 'Canadian Dollar', 'code' => 'CAD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['id' => 10, 'name' => 'Philippine Peso', 'code' => 'PHP', 'symbol' => 'P ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['id' => 11, 'name' => 'Indian Rupee', 'code' => 'INR', 'symbol' => 'Rs. ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['id' => 12, 'name' => 'Australian Dollar', 'code' => 'AUD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 350d4cc43f36..302200fff492 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2459,6 +2459,34 @@ return [
'currency_bahraini_dinar' => 'Bahraini Dinar',
'currency_venezuelan_bolivars' => 'Venezuelan Bolivars',
+
+ 'currency_south_korean_won' => 'South Korean Won',
+ 'currency_moroccan_dirham' => 'Moroccan Dirham',
+ 'currency_jamaican_dollar' => 'Jamaican Dollar',
+ 'currency_angolan_kwanza' => 'Angolan Kwanza',
+ 'currency_haitian_gourde' => 'Haitian Gourde',
+ 'currency_zambian_kwacha' => 'Zambian Kwacha',
+ 'currency_nepalese_rupee' => 'Nepalese Rupee',
+ 'currency_cfp_franc' => 'CFP Franc',
+ 'currency_mauritian_rupee' => 'Mauritian Rupee',
+ 'currency_cape_verdean_escudo' => 'Cape Verdean Escudo',
+ 'currency_kuwaiti_dinar' => 'Kuwaiti Dinar',
+ 'currency_algerian_dinar' => 'Algerian Dinar',
+ 'currency_macedonian_denar' => 'Macedonian Denar',
+ 'currency_fijian_dollar' => 'Fijian Dollar',
+ 'currency_bolivian_boliviano' => 'Bolivian Boliviano',
+ 'currency_albanian_lek' => 'Albanian Lek',
+ 'currency_serbian_dinar' => 'Serbian Dinar',
+ 'currency_lebanese_pound' => 'Lebanese Pound',
+ 'currency_armenian_dram' => 'Armenian Dram',
+ 'currency_azerbaijan_manat' => 'Azerbaijan Manat',
+ 'currency_bosnia_and_herzegovina_convertible_mark' => 'Bosnia and Herzegovina Convertible Mark',
+ 'currency_belarusian_ruble' => 'Belarusian Ruble',
+ 'currency_moldovan_leu' => 'Moldovan Leu',
+ 'currency_kazakhstani_tenge' => 'Kazakhstani Tenge',
+ 'currency_gibraltar_pound' => 'Gibraltar Pound',
+ 'currency_ethiopian_birr' => 'Ethiopian Birr',
+
'review_app_help' => 'We hope you\'re enjoying using the app.
If you\'d consider :link we\'d greatly appreciate it!',
'writing_a_review' => 'writing a review',
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 165f82c7eaf2..074c013daf9e 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -80,7 +80,7 @@