From b83f476f2880f174fcb2331a5b86435d374d87db Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Sat, 16 Nov 2019 10:50:23 +0530 Subject: [PATCH 1/4] remove germen language --- app/Http/Controllers/CompanyController.php | 8 ----- app/Http/Controllers/OnboardingController.php | 3 +- app/Listeners/Updates/V10/Version101.php | 32 ------------------- app/Providers/EventServiceProvider.php | 1 - app/Space/SiteApi.php | 2 +- app/Space/Updater.php | 2 +- 6 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 app/Listeners/Updates/V10/Version101.php diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 585e7752..099ff7e7 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -105,13 +105,6 @@ class CompanyController extends Controller ['key' => 'december-november', 'value' => '12-11'], ]; - $languages = [ - "en" => "English", - "de" => "German", - "fr" => "French", - "es" => "Spanish" - ]; - $language = CompanySetting::getSetting('language', $request->header('company')); $carbon_date_format = CompanySetting::getSetting('carbon_date_format', $request->header('company')); $moment_date_format = CompanySetting::getSetting('moment_date_format', $request->header('company')); @@ -121,7 +114,6 @@ class CompanyController extends Controller $languages = [ ["code"=>"en", "name" => "English"], - ["code"=>"de", "name" => "German"], ["code"=>"fr", "name" => "French"], ["code"=>"es", "name" => "Spanish"] ]; diff --git a/app/Http/Controllers/OnboardingController.php b/app/Http/Controllers/OnboardingController.php index 29ef3e9b..ddb69ad9 100644 --- a/app/Http/Controllers/OnboardingController.php +++ b/app/Http/Controllers/OnboardingController.php @@ -38,7 +38,8 @@ class OnboardingController extends Controller $time_zones = TimeZones::get_list(); $languages = [ ["code"=>"en", "name" => "English"], - ["code"=>"de", "name" => "German"], + ["code"=>"fr", "name" => "French"], + ["code"=>"es", "name" => "Spanish"] ]; $fiscal_years = [ ['key' => 'january-december' , 'value' => '1-12'], diff --git a/app/Listeners/Updates/V10/Version101.php b/app/Listeners/Updates/V10/Version101.php deleted file mode 100644 index 7f966506..00000000 --- a/app/Listeners/Updates/V10/Version101.php +++ /dev/null @@ -1,32 +0,0 @@ -check($event)) { - return; - } - - Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]); - - Setting::setSetting('version', self::VERSION); - } -} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 5ac87a07..d21701a3 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -16,7 +16,6 @@ class EventServiceProvider extends ServiceProvider */ protected $listen = [ UpdateFinished::class=> [ - Version101::class, ], Registered::class => [ SendEmailVerificationNotification::class, diff --git a/app/Space/SiteApi.php b/app/Space/SiteApi.php index ad2194fd..7c9ac7ea 100644 --- a/app/Space/SiteApi.php +++ b/app/Space/SiteApi.php @@ -11,7 +11,7 @@ trait SiteApi protected static function getRemote($url, $data = array()) { - $base = 'http://crater-main.test/'; + $base = 'https://craterapp.com/'; $client = new Client(['verify' => false, 'base_uri' => $base]); diff --git a/app/Space/Updater.php b/app/Space/Updater.php index 093282ed..972b1a3b 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -69,7 +69,7 @@ class Updater // Delete zip file File::delete($file); - if (!File::copyDirectory($temp_path2.'/crater', base_path())) { + if (!File::copyDirectory($temp_path2.'/Crater', base_path())) { return false; } From 848c5646f9f8d742282da0fc9106667fb845cfa1 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Sat, 16 Nov 2019 13:25:39 +0530 Subject: [PATCH 2/4] refactor upadater --- app/Space/Updater.php | 66 ++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/app/Space/Updater.php b/app/Space/Updater.php index 3c58ff28..7fbb337a 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -48,36 +48,37 @@ class Updater File::makeDirectory($temp_path2); } - $file = $temp_path . '/upload.zip'; - - // Add content to the Zip file - $uploaded = is_int(file_put_contents($file, $data)) ? true : false; - - if (!$uploaded) { - return false; - } - - // Unzip the file - $zip = new ZipArchive(); - - if ($zip->open($file)) { - $zip->extractTo($temp_path2); - } - - $zip->close(); - - // Delete zip file - File::delete($file); - - if (!File::copyDirectory($temp_path2.'/Crater', base_path())) { - return false; - } - - // Delete temp directory - File::deleteDirectory($temp_path); - File::deleteDirectory($temp_path2); - try { + + $file = $temp_path . '/upload.zip'; + + // Add content to the Zip file + $uploaded = is_int(file_put_contents($file, $data)) ? true : false; + + if (!$uploaded) { + return false; + } + + // Unzip the file + $zip = new ZipArchive(); + + if ($zip->open($file)) { + $zip->extractTo($temp_path2); + } + + $zip->close(); + + // Delete zip file + File::delete($file); + + if (!File::copyDirectory($temp_path2.'/Crater', base_path())) { + return false; + } + + // Delete temp directory + File::deleteDirectory($temp_path); + File::deleteDirectory($temp_path2); + if (!$isMinor) { event(new UpdateFinished($installed, $version)); } @@ -88,6 +89,13 @@ class Updater 'data' => [] ]; } catch (\Exception $e) { + + if (File::isDirectory($temp_path)) { + // Delete temp directory + File::deleteDirectory($temp_path); + File::deleteDirectory($temp_path2); + } + return [ 'success' => false, 'errors' => 'Update error', From b6af10b68ac13b2780ae501556dea5bdf4a16949 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Sat, 16 Nov 2019 18:18:32 +0530 Subject: [PATCH 3/4] refactor items tax add and update --- app/Http/Controllers/ItemsController.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ItemsController.php b/app/Http/Controllers/ItemsController.php index b9cbb4be..d8d138aa 100644 --- a/app/Http/Controllers/ItemsController.php +++ b/app/Http/Controllers/ItemsController.php @@ -55,6 +55,7 @@ class ItemsController extends Controller if ($request->has('taxes')) { foreach ($request->taxes as $tax) { + $tax['company_id'] = $request->header('company'); $item->taxes()->create($tax); } } @@ -75,12 +76,16 @@ class ItemsController extends Controller $item->price = $request->price; $item->save(); + $oldTaxes = $item->taxes->toArray(); + + foreach ($oldTaxes as $oldTax) { + Tax::destroy($oldTax['id']); + } + if ($request->has('taxes')) { foreach ($request->taxes as $tax) { - $item->taxes()->updateOrCreate( - ['tax_type_id' => $tax['tax_type_id']], - ['amount' => $tax['amount'], 'percent' => $tax['percent'], 'name' => $tax['name']] - ); + $tax['company_id'] = $request->header('company'); + $item->taxes()->create($tax); } } From 988c75db22e5389407c05dda37328fd8a9b66003 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Sat, 16 Nov 2019 18:20:09 +0530 Subject: [PATCH 4/4] refactor event service provider --- app/Providers/EventServiceProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index d21701a3..dcb39372 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -5,7 +5,6 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Crater\Events\UpdateFinished; -use Crater\Listeners\Updates\V10\Version101; class EventServiceProvider extends ServiceProvider {