operator build debug and fix. Faktura warning state

copri4/shareeconf/examples/README

@@ -0,0 +1,6 @@
+#
+Pre-configured Operator Admin Account for first simple start. Please change login and password after setup!
+Login: admin@example.tld
+PW: Please_Change4
+
+

copri4/shareeconf/examples/apikeys.cfg

@@ -1,11 +1,11 @@
-<googlemap>
-  google_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-</googlemap>
-
 <smsgtx>
  gtx_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 </smsgtx>
 
+<pdfprinter>
+ pkey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+</pdfprinter>
+
 <furtherkeys>
  xxxkey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 </furtherkeys>

copri4/shareeconf/examples/global.cfg

@@ -3,10 +3,44 @@
 # Copyright (c) Rainer Gümpelein, TeilRad GmbH
 
 #sub <block> is the dbname of sharee COPRI-Instanz
+
+<primary>
+ <sharee_primary>
+  merchant_id="queexee3Da"
+  owner=298
+  primaryApp="https://shareeapp-operator.example.tld"
+  primaryDMS="https://shareedms-operator.example.tld"
+  primaryApp1="https://shareeapp-operator1.example.tld"
+  primaryDMS1="https://shareedms-operator1.example.tld"
+  syshost="shareedms-operator"
+  dir_app="shareeapp-operator"
+  dir_dms="shareedms-operator"
+  pprefix="PRI"
+  project="all"
+  title="Primary Example"
+  live_hostname="no"
+  bgcolor1="009899"
+  hgcolor1="c0c0c0"
+  fgcolor1="3f3f3f"
+  initMap="47.669305,9.162531"
+  <database>
+   dbname=sharee_operator
+   host="localhost"
+   port=5432
+   sslmode=
+   options=""
+   user=[your-psql-user]
+   passwd=[your-psql-pw]
+  </database>
+ </sharee_primary>
+</primary>
+
+
 <operator>
  <sharee_operator>
-  merchant_id="your-operator-merchant_id"
-  owner=196
+  #merchant_id="your-operator-merchant_id"
+  merchant_id="ong5ohc6Oi"
+  owner=296
   operatorApp="https://shareeapp-operator.example.tld"
   operatorDMS="https://shareedms-operator.example.tld"
   operatorApp1="https://shareeapp-operator1.example.tld"
@@ -16,9 +50,12 @@
   dir_dms="shareedms-operator"
   oprefix="EXA"
   project="Example"
+  title="Operator example"
   app_name="sharee.bike"
   hwtype="none"
   bgcolor1="009899"
+  hgcolor1="c0c0c0"
+  fgcolor1="3f3f3f"
   initMap="47.976634, 7.825490"
   map_zoom="13"
   <database>
@@ -38,15 +75,20 @@
  <shareeweb-project>
   parent_id=100007
   parent_node="frame"
-  merchant_id="your-webproject-merchant_id"
+  #merchant_id="your-webproject-merchant_id"
+  merchant_id="eiFiPaing9"
   owner=294
   operatorWeb="https://shareeweb-project.example.tld"
   operatorWeb1="https://shareeweb-project1.example.tld"
   dir_web="shareeweb-project"
   oprefix="EXA"
+  title="website example"
   project="Example"
+  layout="standalone"
   app_name="sharee.bike"
   bgcolor1="009899"
+  hgcolor1="c0c0c0"
+  fgcolor1="black"
   initMap="47.976634, 7.825490"
   map_zoom="13"
   <database>
@@ -59,35 +101,63 @@
    passwd=[your-psql-pw]
   </database>
  </shareeweb-project>
+</website>
 
 <merchant_ids>
  #contact TeilRad GmbH to get access to our single-sign-on with sharee.bike App
- <your-app-merchant_id>
-  id = 275
-  name = "example App"
+
+ #<your-primary-merchant_id>
+ <queexee3Da>
+  id = 298
+  name = "example Pr"
+  project="all"
+  user_agent = ""
+  initMap = "47.976634, 7.825490"
+  bgcolor1="009899"
+  hgcolor1="c0c0c0"
+  fgcolor1="3f3f3f"
+ </queexee3Da>
+ #</your-primary-merchant_id>
+
+ #<your-operator-merchant_id>
+ <ong5ohc6Oi>
+  id = 296
+  name = "example Op"
   project="Example"
   user_agent = ""
   initMap = "47.976634, 7.825490"
   bgcolor1 = "009899"
- </your-app-merchant_id>
+  hgcolor1="c0c0c0"
+  fgcolor1="3f3f3f"
+ </ong5ohc6Oi>
+ #</your-operator-merchant_id>
 
- <your-operator-merchant_id>
-  id = 296
-  name = "example DMS"
-  project="all"
-  user_agent = ""
-  initMap = "47.976634, 7.825490"
-  bgcolor1 = "009899"
- </your-operator-merchant_id>
-
- <your-webproject-merchant_id>
+ #<your-webproject-merchant_id>
+ <eiFiPaing9>
   id = 294
   name = "example Web"
   project="Example"
   user_agent = ""
   initMap = "47.976634, 7.825490"
   bgcolor1 = "009899"
- </your-webproject-merchant_id>
+  hgcolor1="c0c0c0"
+  fgcolor1="3f3f3f"
+ </eiFiPaing9>
+ #</your-webproject-merchant_id>
+
+ #<your-app-merchant_id>
+ <exzooLu4oh>
+  id = 295
+  name = "example App"
+  project="Example"
+  user_agent = ""
+  initMap = "47.976634, 7.825490"
+  bgcolor1 = "009899"
+  hgcolor1="c0c0c0"
+  fgcolor1="3f3f3f"
+ </exzooLu4oh>
+ #</your-app-merchant_id>
+
 </merchant_ids>
 
 #sharee copri globals
@@ -99,11 +169,6 @@
   superu_id = "1234567"
   logdir = "/var/log/copri4"
   basedir = "/var/www/copri4"
-  <bike_types>
-   300101 = "Lastenrad"
-   300102 = "E-Lastenrad"
-   300103 = "Stadtrad"
-  </bike_types>
   <sharing_type>
     2 = "public"
     3 = "private"
@@ -113,22 +178,26 @@
     1 = "available"
     2 = "requested"
     3 = "occupied"
-    4 = "maintanance"
+    4 = "maintenance"
     5 = "defect"
     6 = "canceled"
   </bike_state>
   <station_state>
     1 = "available"
+    4 = "maintenance"
     5 = "defect"
   </station_state>
   <lock_state>
     1 = "locked"
     2 = "unlocked"
     3 = "locking"
+    4 = "unlocking"
   </lock_state>
   <station_lock_state>
     1 = "locked"
     2 = "unlocked"
+    3 = "locking"
+    4 = "unlocking"
   </station_lock_state>
   <lock_system>
     2 = "Ilockit"
@@ -143,10 +212,7 @@
     2 = "lesen & schreiben"
   </permission>
   jsscript = "js/mobile_script.js"
-  jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.js"
-  style_jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.css"
-  style_bootstrap_icons = "css/bootstrap-icons-1.5.0/bootstrap-icons.css"
-  jquery_resize = "js/jquery.autosize.js"
+  style_bootstrap_icons = "css/bootstrap-icons-1.8.1/font/bootstrap-icons.css"
 </copri_conf>
 
 #sharee WebApp sepcific para
@@ -161,11 +227,10 @@
   accounting_2 = "2.0. Zahlungsdaten"
   accounting_3 = "3. Verleihdaten"
 
-  local_style = "css/local_style1344.css"
-  jquery = "js/jquery-1.9.1.js"
-  js_bootstrap = "js/bootstrap-3.3.6-dist/js/bootstrap.min.js"
-  style_bootstrap = "js/bootstrap-3.3.6-dist/css/bootstrap.css"
-  mod_active = "Fahrradmietsystem|Karte|Anmelden|Kontakt"
+  local_style = "css/local_style2022-03-20.css"
+  jquery = ""
+  js_bootstrap = "js/bootstrap-5.1.3-dist/js/bootstrap.min.js"
+  style_bootstrap = "js/bootstrap-5.1.3-dist/css/bootstrap.css"
 </shareeapp_conf>
 
 #sharee DMS/COPRI specific para
@@ -183,10 +248,17 @@
   mietjournal = "200012"
   alarmjournal = "200022"
   einstellung = "200019"
+  serviceconfig = "300025"
+
+  payment_state = "SEPA-Lastschrift (payone)|Kreditkarte (payone)|Überweisung|Gutschrift"
+  order_state = "|angerufen|eMail gesendet|in Arbeit|cronjob fail"
 
   term_active_color = "f7ae37"
-  local_style = "css/local_style_2.css"
+  local_style = "css/local_style20221106.css"
   jquery = "js/jquery-3.3.1.min.js"
+  jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.js"
+  style_jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.css"
+  jquery_resize = "js/jquery.autosize.js"
   js_bootstrap = "js/bootstrap-5.0.2-dist/js/bootstrap.min.js"
   style_bootstrap = "js/bootstrap-5.0.2-dist/css/bootstrap.min.css"
   mod_active = "Waren|Faktur|Karte|Kunden|Mietjournal|Alarmjournal|Einstellung"