Merge pull request #4832 from turbo124/v5-stable

Fixes for migration

VERSION.txt

@@ -1 +1 @@
-5.1.0
+5.1.1

app/Jobs/Util/Import.php

@@ -265,13 +265,14 @@ class Import implements ShouldQueue
 
         $validator = Validator::make($data, $rules);
 
-        if ($validator->fails()) {
+        if ($validator->fails()) 
             throw new MigrationValidatorFailed(json_encode($validator->errors()));
-        }
-
-        if (isset($data['account_id'])) {
+        
+        if (isset($data['account_id'])) 
             unset($data['account_id']);
-        }
+        
+        if(isset($data['version']))
+            unset($data['version']);
 
         if (isset($data['referral_code'])) {
             $account = $this->company->account;

config/ninja.php

@@ -13,7 +13,7 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.1.0',
+    'app_version' => '5.1.1',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

resources/lang/en/texts.php

@@ -4136,6 +4136,8 @@ $LANG = array(
      'online_payments_minimum_note' => 'Note: Online payments are supported only if amount is bigger than $1 or currency equivalent.',
      'payment_token_not_found' => 'Payment token not found, please try again. If an issue still persist, try with another payment method',
 
+     /////////////////////////////////////////////////
+     'start_migration' => 'Start Migration',
 );
 
 return $LANG;