diff --git a/app/Nova/Resources/Order/Loan/LoanOrder.php b/app/Nova/Resources/Order/Loan/LoanOrder.php index f9060ed..bb01c1b 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanOrder.php @@ -9,12 +9,14 @@ use App\Nova\Resources\Order\Loan\Concerns\LoanOrderEvents; use App\Nova\Resources\Order\Loan\Concerns\LoanOrderNovaRepo; use App\Repos\Order\Loan\BranchRepo; use App\Repos\Order\Loan\LoanTypeRepo; +use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Legal\EducationRepo; use App\Repos\System\Settings\Legal\MarriageRepo; use App\Repos\System\Settings\Legal\PassportRepo; use App\Repos\System\Settings\Location\RegionRepo; use Illuminate\Http\Request; use Konsulting\NovaTarget\NovaTarget; +use Laravel\Nova\Fields\Badge; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Email; use Laravel\Nova\Fields\File; @@ -101,7 +103,7 @@ class LoanOrder extends Resource return [ ID::make()->hide(), - Text::make(__('Unique id'), 'unique_id')->sortable(), + Text::make(__('ID'), 'unique_id')->sortable(), Select::make(__('Loan type'), 'loan_type') ->displayUsingLabels() @@ -118,11 +120,20 @@ class LoanOrder extends Resource ->options(BranchRepo::values()) ->sortable(), - Text::make(__('Customer name'), 'customer_name'), + Text::make(__('Name'), 'customer_name'), - Text::make(__('Customer surname'), 'customer_surname'), + Text::make(__('Surname'), 'customer_surname'), - Text::make(__('Phone'), 'phone') + Text::make(__('Phone'), 'phone'), + + Badge::make(__('Status'), 'status') + ->map(OrderRepo::statusClasses()) + ->addTypes([ + 'primary' => 'dark:bg-gray-900 bg-gray-600 text-white', + ]) + ->labels(OrderRepo::statusValues()) + ->withIcons() + ->sortable(), ]; } @@ -165,15 +176,15 @@ class LoanOrder extends Resource ]), new Panel(__('Personal data'), [ - Text::make(__('Customer name'), 'customer_name') + Text::make(__('Name'), 'customer_name') ->size('w-1/3') ->rules('required', 'string', 'max:255'), - Text::make(__('Customer surname'), 'customer_surname') + Text::make(__('Surname'), 'customer_surname') ->size('w-1/3') ->rules('required', 'string', 'max:255'), - Text::make(__('Customer patronic name'), 'customer_patronic_name') + Text::make(__('Patronic name'), 'customer_patronic_name') ->size('w-1/3') ->rules('required', 'string', 'max:255'), diff --git a/app/Repos/System/Settings/Legal/EducationRepo.php b/app/Repos/System/Settings/Legal/EducationRepo.php index f3fc19d..18be3e6 100644 --- a/app/Repos/System/Settings/Legal/EducationRepo.php +++ b/app/Repos/System/Settings/Legal/EducationRepo.php @@ -29,7 +29,7 @@ class EducationRepo self::MIDDLE_SCHOOL => __('Middle school'), self::UNFINISHED_HIGH_EDUCATION => __('Unfinished high education'), self::HIGH_EDUCATION => __('High education'), - self::MASTERS => __('Masters'), + self::MASTERS => __('Masters ED'), self::PHD => __('PHD'), ]; } diff --git a/composer.json b/composer.json index 2cfa46b..1d2f290 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^7.0", "phpunit/phpunit": "^10.1", + "singlequote/laravel-locale-finder": "^1.0", "spatie/laravel-ignition": "^2.0" }, "autoload": { diff --git a/composer.lock b/composer.lock index 57a6257..d67bf10 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": "f339ec5654f56037abedbd8f4046b180", + "content-hash": "f31a821ebd315e93b1c5ebe74a06de5f", "packages": [ { "name": "brick/math", @@ -9241,6 +9241,65 @@ ], "time": "2023-02-07T11:34:05+00:00" }, + { + "name": "singlequote/laravel-locale-finder", + "version": "1.0.19", + "source": { + "type": "git", + "url": "https://github.com/singlequote/laravel-locale-finder.git", + "reference": "e8143c5f294aefa3e6fa5c0866f92fc53c9cdc70" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/singlequote/laravel-locale-finder/zipball/e8143c5f294aefa3e6fa5c0866f92fc53c9cdc70", + "reference": "e8143c5f294aefa3e6fa5c0866f92fc53c9cdc70", + "shasum": "" + }, + "require": { + "laravel/framework": ">=9", + "php": "^8.0", + "stichoza/google-translate-php": "^4.1" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "SingleQuote\\LocaleFinder\\LocaleFinderServiceProvider" + ], + "aliases": { + "LocaleFinder": "SingleQuote\\LocaleFinder\\LocaleFinderFacade" + } + } + }, + "autoload": { + "psr-4": { + "SingleQuote\\LocaleFinder\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Wim Pruiksma", + "email": "wim@quotec.nl", + "homepage": "https://quotec.nl/" + } + ], + "homepage": "https://github.com/singlequote/laravel-locale-finder", + "keywords": [ + "auto", + "laravel", + "locale", + "translations" + ], + "support": { + "issues": "https://github.com/singlequote/laravel-locale-finder/issues", + "source": "https://github.com/singlequote/laravel-locale-finder/tree/1.0.19" + }, + "time": "2023-08-11T09:41:09+00:00" + }, { "name": "spatie/backtrace", "version": "1.5.3", @@ -9548,6 +9607,86 @@ ], "time": "2023-10-09T12:55:26+00:00" }, + { + "name": "stichoza/google-translate-php", + "version": "v4.1.7", + "source": { + "type": "git", + "url": "https://github.com/Stichoza/google-translate-php.git", + "reference": "14f6a9c84cd860910706ee3a668fba8a0a1aac0f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Stichoza/google-translate-php/zipball/14f6a9c84cd860910706ee3a668fba8a0a1aac0f", + "reference": "14f6a9c84cd860910706ee3a668fba8a0a1aac0f", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "guzzlehttp/guzzle": "~6.0|~7.0", + "php": "^7.1|^8" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Stichoza\\GoogleTranslate\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Levan Velijanashvili", + "email": "me@stichoza.com" + } + ], + "description": "Free Google Translate API PHP Package", + "homepage": "https://github.com/Stichoza/google-translate-php", + "keywords": [ + "google", + "php", + "translate", + "translating", + "translator" + ], + "support": { + "issues": "https://github.com/Stichoza/google-translate-php/issues", + "source": "https://github.com/Stichoza/google-translate-php/tree/v4.1.7" + }, + "funding": [ + { + "url": "https://btc.com/bc1qc25j4x7yahghm8nnn6lypnw59nptylsw32nkfl", + "type": "custom" + }, + { + "url": "https://www.paypal.me/stichoza", + "type": "custom" + }, + { + "url": "https://ko-fi.com/stichoza", + "type": "ko_fi" + }, + { + "url": "https://liberapay.com/stichoza", + "type": "liberapay" + }, + { + "url": "https://opencollective.com/stichoza", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/stichoza", + "type": "patreon" + } + ], + "time": "2022-11-25T11:17:52+00:00" + }, { "name": "symfony/yaml", "version": "v6.3.8", diff --git a/config/locale-finder.php b/config/locale-finder.php new file mode 100644 index 0000000..2ed336f --- /dev/null +++ b/config/locale-finder.php @@ -0,0 +1,76 @@ + [ + "lang_folder" => base_path('lang') + ], + + /* + |-------------------------------------------------------------------------- + | The search options + |-------------------------------------------------------------------------- + | + */ + "search" => [ + + /* + |-------------------------------------------------------------------------- + | The folders the package uses to scan for translation keys + |-------------------------------------------------------------------------- + | + */ + "folders" => [ + base_path("app"), + resource_path("views"), + ], + + /* + |-------------------------------------------------------------------------- + | Enter specific files + |-------------------------------------------------------------------------- + | + */ + "files" => [ + ], + + /* + |-------------------------------------------------------------------------- + | The folders the package excludes from scanning + |-------------------------------------------------------------------------- + | + */ + "exclude" => [ + "storage", + ], + + /* + |-------------------------------------------------------------------------- + | The files the package uses to scan for translation keys + |-------------------------------------------------------------------------- + | + */ + "file_extension" => [ + '*.php', + '*.js', + ] + ], + + /* + |-------------------------------------------------------------------------- + | The methods used to translate keys + |-------------------------------------------------------------------------- + | + */ + "translation_methods" => [ + '\$t', + 'i18n.t', + '@lang', + '__', + 'trans_choice', + ], +]; diff --git a/lang/tk.json b/lang/tk.json new file mode 100644 index 0000000..af7fd9c --- /dev/null +++ b/lang/tk.json @@ -0,0 +1,86 @@ +{ + "Active": "Işjeň", + "Address": "Salgysy", + "Ahal": "Ahal", + "Arkadag": "Arkadag", + "Ashgabat": "Aşgabat", + "Balkan": "Balkan", + "Billing password": "Hasap paroly", + "Billing username": "Hasap ulanyjy ady", + "Born place (passport)": "Doglan ýeri (pasport)", + "Branch": "Şahamça", + "Branches": "Şahamçalar", + "Cancelled": "Ýatyrylan", + "Completed": "Tamamlanan", + "Contact data": "Habarlaşmak üçin maglumatlar", + "Current Residence": "Häzirki ýaşaýyş ýeri", + "Name": "Adyňyz", + "Patronic name": "Ataňyzyň ady", + "Surname": "Familiýaňyz", + "Dashoguz": "Daşoguz", + "Date of birth": "Doglan gün", + "Divorced": "Aýrylşan", + "Education": "Bilim", + "Email": "E-poçta", + "Guard name": "Guard name", + "High education": "Ýokary bilim", + "Home phone": "Öý telefony", + "HR department work number": "Işgärler bölüminiň iş belgisi", + "Job": "Iş", + "Lebap": "Lebap", + "Legal Marriage": "Kanuny nika", + "Loan": "Karz", + "Loan order": "Karz sargyt", + "Loan orders": "Karz sargytlary", + "Loan type": "Karz görnüşi", + "Loan types": "Karz görnüşleri", + "Location": "Ýerleşýän ýeri", + "Marriage status": "Nika ýagdaýy", + "Married": "Öýlenen", + "Mary": "Mary", + "Masters ED": "Ussalar", + "Maturity": "Kämillik", + "Middle school": "Orta mekdep", + "My Profile": "Meniň profilim", + "None": "Hiç", + "Notes": "Bellikler", + "Orders": "Sargytlar", + "Passport": "Pasport", + "Passport (page 1)": "Pasport (sahypa 1)", + "Passport (page 2-3)": "Pasport (2-3-nji sahypa)", + "Passport (page 8-9)": "Pasport (8-9 sahypa)", + "Passport (page 32)": "Pasport (32-nji sahypa)", + "Passport date of issue": "Pasport berlen senesi", + "Passport given by": "Pasport", + "Passport id": "Pasport belgisi", + "Passport serie": "Pasport seriýasy", + "Pending": "Garaşylýar", + "Personal data": "Şahsy maglumatlar", + "PHD": "PHD", + "Phone": "Telefon", + "Phone Additional": "Telefon goşmaça", + "Position": "Positionerleşişi", + "Processing": "Gaýtadan işlemek", + "Province": "Welaýat", + "Provinces": "Welaýatlar", + "Region": "Welaýat", + "Registered": "Bellige alyndy", + "Residence (passport)": "Ýazgy edilen salgyňyz", + "Role": "Rol", + "Roles": "Rollar", + "Salary": "Aýlygyň möçberi (TMT)", + "School": "Mekdep", + "School drop out": "Mekdep okuwy taşlady", + "Single": "Leeke", + "System": "Ulgam", + "Tax": "Salgyt", + "Unfinished high education": "Gutarylmadyk ýokary bilim", + "Unique code": "Unikal belgi", + "Unique id": "Unikal belgi", + "User": "Ulanyjy", + "Widow": "Dul aýal", + "Work company name": "Işleýän edaranyň/kärhananyň ady", + "Work province": "Işleýän etrabyňyz", + "Work region": "Işleýän welaýatyňyz", + "Work started at": "Işe başlan wagtyňyz" +}