From 604f8993d3e247d7fa31580d8c1c0c1516585dd1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 6 Jul 2023 16:45:16 +1000
Subject: [PATCH] Fixes for build paths

---
 .github/workflows/release.yml                 |  2 +-
 app/Console/Commands/TranslationsExport.php   |  2 -
 .../2023_07_06_063512_update_designs.php      | 45 +++++++++++++++++++
 lang/en/texts.php                             |  4 ++
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/2023_07_06_063512_update_designs.php

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eee6165df82b..1981601c10d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
           npm i
           npm run build
           cp -r dist/react/* ../public/react 
-          mkdir -p public/tinymce_6.4.2/tinymce/js/
+          mkdir -p ../public/tinymce_6.4.2/tinymce/js/
           cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/
           cd ..
           rm -rf ui
diff --git a/app/Console/Commands/TranslationsExport.php b/app/Console/Commands/TranslationsExport.php
index b00461a3c46b..5668f8d6f5f1 100644
--- a/app/Console/Commands/TranslationsExport.php
+++ b/app/Console/Commands/TranslationsExport.php
@@ -133,11 +133,9 @@ class TranslationsExport extends Command
         Storage::disk('local')->makeDirectory('lang');
 
         foreach ($this->langs as $lang) {
-            nlog($lang);
             Storage::disk('local')->makeDirectory("lang/{$lang}");
 
             $translations = Lang::getLoader()->load($lang, 'texts');
-nlog($translations);
             Storage::disk('local')->put("lang/{$lang}/{$lang}.json", json_encode(Arr::dot($translations), JSON_UNESCAPED_UNICODE));
         }
     }
diff --git a/database/migrations/2023_07_06_063512_update_designs.php b/database/migrations/2023_07_06_063512_update_designs.php
new file mode 100644
index 000000000000..94e0b624ed74
--- /dev/null
+++ b/database/migrations/2023_07_06_063512_update_designs.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        \Illuminate\Support\Facades\Artisan::call('ninja:design-update');
+
+        $t = \App\Models\Country::find(158);
+        
+        if($t) {
+            $t->full_name = 'Taiwan';
+            $t->save();
+        }
+
+        $m = \App\Models\Country::find(807);
+
+        if($m) {
+            $m->full_name = 'Macedonia';
+            $m->save();
+        }
+
+
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};
diff --git a/lang/en/texts.php b/lang/en/texts.php
index d447137b99c9..e8a774dd600f 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5114,6 +5114,10 @@ $LANG = array(
     'item_tax_rate2' => 'Item Tax Rate 2',
     'item_tax_rate3' => 'Item Tax Rate 3',
     'buy_price' => 'Buy Price',
+    'country_Macedonia' => 'Macedonia',
+    'admin_initiated_payments' => 'Admin Initiated Payments',
+    'admin_initiated_payments_help' => 'Support entering a payment in the admin portal without an invoice',
+    'paid_date' => 'Paid Date',
 );