Added translations and fixed an issue about jobs show links

umomega · Nov 7, 2018 · 3449bcf · 3449bcf
1 parent 6cab737
commit 3449bcf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/app/Http/Controllers/JobsController.php b/app/Http/Controllers/JobsController.php
@@ -53,10 +53,11 @@ public function searchJson(Request $request)
      * List the specified resource transactions.
      *
      * @param Request $request
+     * @param int $parent
      * @param int $id
      * @return Response
      */
-    public function show(Request $request, $id)
+    public function show(Request $request, $parent, $id)
     {
         $job = Job::findOrFail($id);
 

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -14,7 +14,7 @@
 class AppServiceProvider extends ServiceProvider
 {
 
-    const VERSION = '1.0-alpha.2';
+    const VERSION = '1.0-alpha.3';
 
     /**
      * Bootstrap any application services.

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "umomega/bookkeeper",
     "description": "Laravel Powered Finance Tracker and CRM.",
     "keywords": ["umomega", "bookkeeper", "finance", "crm", "multilingual", "laravel", "laravel5", "php", "php7", "finance-application", "bookkeeping", "finance-tracker"],
-    "version": "1.0-alpha.2",
+    "version": "1.0-alpha.3",
     "license": "MIT",
     "type": "project",
     "authors": [

diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
@@ -185,6 +185,8 @@
         'tax_number'               => 'Tax Number',
         'balance'                  => 'Balance',
         'vat_percentage'           => 'VAT Percentage',
+        'invoice'                  => 'Invoice',
+        'offer'                    => 'Offer',
     ],
 
 ];
diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php
@@ -185,6 +185,8 @@
         'tax_number'               => 'Vergi Numarası',
         'balance'                  => 'Bakiye',
         'vat_percentage'           => 'KDV Yüzdesi',
+        'invoice'                  => 'Fatura',
+        'offer'                    => 'Teklif',
     ],
 
 ];