s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

shopimport preview table

Browse Source
This commit is contained in:
OpenXE 2024-06-19 21:31:40 +02:00
parent 471bceb060
commit 15c36925a2
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
www/pages/shopimport.php
View File

@ -52,6 +52,7 @@ class Shopimport
$this->app->ActionHandler("list","ShopimportList");
$this->app->ActionHandler("alle","ShopimportAlle");
$this->app->ActionHandler("import","ShopimportImport");
$this->app->ActionHandler("view","ShopimportView");
$this->app->ActionHandler("einzelimport","ShopimportEinzelimport");
$this->app->ActionHandler("navigation","ShopimportNavigation");
$this->app->ActionHandler("logout","ShopimportLogout");
@ -339,9 +340,9 @@ class Shopimport
$this->app->Tpl->Set('TAB1','<div class="error">Es l&auml;uft gerade ein Cronjob der Auftr&auml;ge abholt. Die manuelle Auftragsabholung ist in dieser Zeit gesperrt. Bitte warten Sie ein paar Minuten und versuchen Sie es erneut.</div>');
}else{
$table = new EasyTable($this->app);
$table->Query("SELECT ae.bezeichnung,p.abkuerzung,
$table->Query("SELECT ae.bezeichnung,p.abkuerzung as Projekt,
ae.id FROM shopexport ae LEFT JOIN projekt p ON p.id=ae.projekt WHERE ae.aktiv='1'");
$table->DisplayNew('INHALT',"<a href=\"index.php?module=shopimport&action=import&id=%value%\"><img src=\"./themes/new/images/forward.svg\" title=\"Shopimport\"></a>&nbsp;<a href=\"index.php?module=onlineshops&action=edit&id=%value%\"><img src=\"./themes/new/images/edit.svg\" title=\"Onlineshops\"></a>&nbsp;<!--<a href=\"index.php?module=shopimport&action=archiv&id=%value%\">Archiv</a>-->");
$table->DisplayNew('INHALT',"<a href=\"index.php?module=shopimport&action=import&id=%value%\"><img src=\"./themes/new/images/download.svg\" title=\"Importieren\"></a>&nbsp;<a href=\"index.php?module=shopimport&action=view&id=%value%\"><img src=\"./themes/new/images/lupe.svg\" title=\"Ansicht\"></a>&nbsp;<a href=\"index.php?module=onlineshops&action=edit&id=%value%\"><img src=\"./themes/new/images/edit.svg\" title=\"Bearbeiten\"></a>&nbsp;<!--<a href=\"index.php?module=shopimport&action=archiv&id=%value%\">Archiv</a>-->");
$this->app->Tpl->Parse('TAB1','rahmen.tpl');
}
$this->app->Tpl->Set('INHALT','');
@ -949,6 +950,10 @@ class Shopimport
$bekanntezahlungsweisen = $this->app->erp->GetZahlungsweise();
$tmpauftragid = $this->app->erp->ImportAuftrag($adresse,$warenkorb,$projekt,$shopid);
if ($tmpauftragid > 0) {
$sucess_import = true;
}
$doctype = 'auftrag';
if($this->app->DB->Select("SELECT angeboteanlegen FROM shopexport WHERE id = '$shopid' LIMIT 1"))
{
@ -971,7 +976,7 @@ class Shopimport
}
}
if($shopimportid)
if($shopimportid && $tmpauftragid)
{
$this->app->DB->Update("UPDATE shopimport_auftraege SET imported='1' WHERE id='$shopimportid' LIMIT 1");
}
@ -985,10 +990,7 @@ class Shopimport
}
$this->app->erp->RunHook('Shopimportwarenkorb', 4, $doctype, $tmpauftragid, $shopid, $warenkorb);
$this->app->erp->RunHook('Shopimport', 3, $doctype, $tmpauftragid, $shopid);
$adresse ='';
$sucess_import++;
return $sucess_import;
}
@ -1112,6 +1114,10 @@ class Shopimport
return ['codingerror'=>$umlautefehler, 'success' => $succes];
}
public function ShopimportView() {
$this->ShopimportImport(showonly: true);
}
public function ShopimportImport($id='', $count = 0, $returncount = false, $showonly = false)
{
$deletedRows = 0;
@ -2002,7 +2008,6 @@ class Shopimport
$htmltable->AddCol('<input type="radio" name="import['.$arr[$i]['id'].']" value="warten"'.(($doppelteonlinebestellnummer || $auftraegeaufspaeter)?' checked="checked" ':'').'>');
$htmltable->AddCol($arr[$i]['abkuerzung']);
$htmltable->AddCol(($doppelteonlinebestellnummer?'<b style="color:red">':'').$warenkorb['onlinebestellnummer'].($doppelteonlinebestellnummer?'</b>':''));
$htmltable->AddCol($warenkorb['name'].$kdr_name.'<br>'.$warenkorb['email'].$email);
$htmltable->AddCol($warenkorb['internebezeichnung']);

36
www/themes/new/images/lupe.svg Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="5.56mm" height="5.56mm" fill-rule="evenodd" stroke-linejoin="round" stroke-width="28.222" preserveAspectRatio="xMidYMid" version="1.2" viewBox="0 0 556 556" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
<defs class="ClipPathGroup"><clipPath id="presentation_clip_path">
<rect width="556" height="556"/>
</clipPath></defs>
<g class="Master_Slide">
</g>
<g class="SlideGroup">
<g class="Slide" clip-path="url(#presentation_clip_path)">
<g class="Page">
<g class="com.sun.star.drawing.ClosedBezierShape">
<rect class="BoundingBox" x="175" y="80" width="302" height="302" fill="none"/>
<path d="m421 286c10-17 15-36 15-56 0-19-5-38-15-55s-23-30-40-40-36-15-56-15c-19 0-38 5-55 15s-30 23-40 40-15 36-15 56c0 19 5 38 15 55s23 30 40 40 36 15 56 15c19 0 38-5 55-15s30-23 40-40zm35 20c-13 23-32 42-55 55s-49 20-75 20c-27 0-53-7-76-20s-42-32-55-55-20-49-20-75c0-27 7-53 20-76s32-42 55-55 49-20 75-20c27 0 53 7 76 20s42 32 55 55 20 49 20 75c0 27-7 53-20 76z" fill="#929292"/>
<rect class="BoundingBox" x="78" y="286" width="190" height="191" fill="none"/>
<path d="m195 306c13 23 32 42 55 55 6 3 11 6 17 8l-102 102c-2 3-5 4-8 4h-67c-6 0-11-5-11-11v-67c0-3 1-6 4-8l103-103c2 7 6 14 9 20z" fill="#929292"/>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB