fix db fehler

ReallifeGamemode.Client/Gui/taximeter.ts

@@ -8,6 +8,11 @@ let lastPrice: Number = 0;
 let totalPrice: Number = 0;
 var myVar;
 export default function taximeterInput(globalData: IGlobalData) {
+    var customerBrowser: boolean = false;
+
+    var price1_browser = 0;
+    var km_browser = 0;
+
     mp.events.add("CLIENT:setFarePrice", () => {
         /*
         var textBox = new InputHelper("Setzen Sie ihre Fahrtkosten [2 - 50 $/km]", globalData);
@@ -29,15 +34,14 @@ export default function taximeterInput(globalData: IGlobalData) {
 
     mp.events.add("CLIENT:startFare", () => {
         browser = mp.browsers.new('package://assets/html/taximeter/index.html');
-        browser.execute(`setFarePrice('${price}');`)
-        myVar = setInterval(myTimer, 100);
     });
 
     mp.events.add('CLIENT:stopFare', () => {
-        browser.destroy()
+        if (browser) {
+            browser.destroy();
             browser = null;
+        }
         globalData.InInput = false;
-        return;
     });
 
     function myTimer() {
@@ -53,33 +57,50 @@ export default function taximeterInput(globalData: IGlobalData) {
     });
 
 
-    mp.events.add("CLIENT:startCustomerFare", (price1, km) => {
+    mp.events.add("CEF:Taxi_CefLoaded", () => {
-        browser = mp.browsers.new('package://assets/html/taximeter/index.html');
+        if (!customerBrowser) {
-        browser.execute(`setFarePrice('${price1}');`);
+            browser.execute(`setFarePrice('${price}');`)
-        browser.execute(`updateKilometer('${km}')`);
+            myVar = setInterval(myTimer, 100);
+        } else {
+            browser.execute(`setFarePrice('${price1_browser}');`);
+            browser.execute(`updateKilometer('${km_browser}')`);
+        }
+    });
 
+    mp.events.add("CLIENT:startCustomerFare", (price1, km) => {
+        price1_browser = price1;
+        km_browser = km;
+
+        browser = mp.browsers.new('package://assets/html/taximeter/index.html');
     });
 
     mp.events.add("CLIENT:updateFare", (km) => {
-        browser.execute(`updateKilometer('${JSON.parse(km)}')`)
+        if (browser) {
+            browser.execute(`updateKilometer('${JSON.parse(km)}')`);
+        }
     });
 
 
     mp.events.add("CLIENT:cancelFareCustomer", () => { //for Customer
-        mp.events.callRemote("SERVER:cancelFareCustomer", lastPrice);
+        if (browser) {
             browser.destroy();
             browser = null;
+        }
+
+        mp.events.callRemote("SERVER:cancelFareCustomer", lastPrice);
     });
 
     mp.events.add("CLIENT:cancelFare", () => { //for Taxidriver
+        if (browser) {
             browser.destroy();
             browser = null;
+        }
     });
 
     mp.events.add("CLIENT:resetFareClock", () => { //for Taxidriver
+        if (browser) {
             clearInterval(myVar);
             browser.execute(`setFarePrice('${price}');`)
-    });
+        }
-
+    });
-   
 }

ReallifeGamemode.Client/assets/js/taximeter/main.js

@@ -1,7 +1,9 @@
 var lastKilometer = 0;
 var price;
 
-document.addEventListener('DOMContentLoaded', function () { });
+document.addEventListener('DOMContentLoaded', function () {
+    mp.trigger('CEF:Taxi_CefLoaded');
+});
 
 const TOTAL_PRICE = document.getElementById("taximeter-price");
 const PRICE_KM = document.getElementById("taximeter-price-kilometer");

ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs

@@ -0,0 +1,43 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ReallifeGamemode.Database.Migrations
+{
+    public partial class AddUserOtherAmount : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "otheramount",
+                table: "Users",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "trashcount",
+                table: "Users",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "GangOwned",
+                table: "Factions",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "otheramount",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "trashcount",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "GangOwned",
+                table: "Factions");
+        }
+    }
+}

ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -469,6 +469,9 @@ namespace ReallifeGamemode.Database.Migrations
                     b.Property<int?>("BankAccountId")
                         .HasColumnType("int");
 
+                    b.Property<bool>("GangOwned")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<string>("Name")
                         .HasColumnType("varchar(32) CHARACTER SET utf8mb4")
                         .HasMaxLength(32);
@@ -1017,7 +1020,8 @@ namespace ReallifeGamemode.Database.Migrations
                     b.Property<float>("PositionZ")
                         .HasColumnType("float");
 
-                    b.Property<int>("Type");
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -1411,6 +1415,12 @@ namespace ReallifeGamemode.Database.Migrations
                     b.Property<bool>("WeaponLicense")
                         .HasColumnType("tinyint(1)");
 
+                    b.Property<int>("otheramount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("trashcount")
+                        .HasColumnType("int");
+
                     b.HasKey("Id");
 
                     b.HasIndex("BanId");