| ';
echo wpsg_translate(
__('wpShopGermany Vollversion erwerben und weitere Funktionen freischalten. [ Vollversion kaufen ] [ Weitere Infos ]', 'wpsg'),
@@ -197,5 +197,5 @@
' wpShopGermany benötigt mindestens PHP 5.4. '.
'',
@@ -394,4 +394,5 @@
wp_enqueue_style('wp-jquery-ui-dialog');
wp_enqueue_style('wpsg-tooltipstyle', $GLOBALS['wpsg_sc']->getRessourceURL('js/jquery-cluetip-master/jquery.cluetip.css'));
+ wp_enqueue_style('wpsg-adminstyle', $GLOBALS['wpsg_sc']->getRessourceURL('css/admin.css'));
wp_enqueue_style('wpsg-tooltipadminstyle', $GLOBALS['wpsg_sc']->getRessourceURL('css/tooltip.css'));
@@ -464,5 +465,5 @@
global $wp_filesystem;
- if ($_REQUEST['plugin'] != 'wpshopgermany/wpshopgermany.php') return;
+ if ($_REQUEST['plugin'] != WPSG_FOLDERNAME.'/wpshopgermany.php') return;
if (!isset($_REQUEST['_ajax_nonce'])) echo __('Kopiere Shop aus dem Pluginverzeichnis ...', 'wpsg').'
';
@@ -537,5 +538,5 @@
global $wp_filesystem;
- if ($_REQUEST['plugin'] != 'wpshopgermany/wpshopgermany.php') return;
+ if ($_REQUEST['plugin'] != WPSG_FOLDERNAME.'/wpshopgermany.php') return;
if ($GLOBALS['wpsg_sc']->get_option('wpsg_debugURL') === '1' && $GLOBALS['wpsg_sc']->hasMod('wpsg_mod_core'))
Index: /lib/helper_functions.inc.php
===================================================================
--- /lib/helper_functions.inc.php (revision 5371)
+++ /lib/helper_functions.inc.php (revision 5382)
@@ -583,4 +583,26 @@
} // function wpsg_drawForm_Checkbox($field_name, $field_label, $conf = array())
+ function wpsg_drawForm_TextStart()
+ {
+
+ ob_start();
+
+ } // function wpsg_drawForm_TextStart()
+
+ function wpsg_drawForm_TextEnd($field_label)
+ {
+
+ $TC = new wpsg_ShopController();
+
+ $TC->view['field_label'] = $field_label;
+ $TC->view['field_value'] = ob_get_contents();
+ $TC->view['field_config'] = array();
+
+ ob_end_clean();
+
+ return $TC->render(WPSG_PATH_VIEW.'admin/form/text.phtml', false);
+
+ } // function wpsg_drawForm_TextEnd($field_label)
+
function wpsg_drawForm_Text($field_label, $field_value, $conf = array())
{
@@ -588,7 +610,5 @@
$TC = new wpsg_ShopController();
- $TC->view['field_name'] = $field_name;
$TC->view['field_label'] = $field_label;
- $TC->view['field_id'] = wpsg_drawForm_getID($field_name);
$TC->view['field_value'] = $field_value;
$TC->view['field_config'] = $conf;
Index: /lib/update.php
===================================================================
--- /lib/update.php (revision 5371)
+++ /lib/update.php (revision 5382)
@@ -23,4 +23,5 @@
{
+ $wpsg_reqpage = (($pages_show['wpsg_reqpage'] == '1')?'1':'0');
$wpsg_agbpage = (($pages_show['wpsg_agbpage'] == '1')?'1':'0');
$wpsg_wrpage = (($pages_show['wpsg_wrpage'] == '1')?'1':'0');
@@ -36,4 +37,5 @@
{
+ $widget[$k]['wpsg_reqpage'] = $wpsg_reqpage;
$widget[$k]['wpsg_agbpage'] = $wpsg_agbpage;
$widget[$k]['wpsg_wrpage'] = $wpsg_wrpage;
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php (revision 5371)
+++ /lib/wpsg_basket.class.php (revision 5382)
@@ -147,4 +147,5 @@
}
+ $GLOBALS['wpsg_lastInsertIndex'] = $p_key;
$_SESSION['wpsg']['basket'][$p_key]['menge'] += intval($menge);
@@ -186,4 +187,6 @@
//$_SESSION['wpsg']['basket'][] = wpsg_xss($ses_data);
array_push($_SESSION['wpsg']['basket'], wpsg_xss($ses_data));
+ end($_SESSION['wpsg']['basket']);
+ $GLOBALS['wpsg_lastInsertIndex'] = key($_SESSION['wpsg']['basket']);
return true;
@@ -452,5 +455,5 @@
public function sendOrderSaveMails($order_id, $arBasket, $bCustomerMail = true, $bAdminMail = true, $bDebug = false)
{
-
+
$oOrder = wpsg_order::getInstance($order_id);
@@ -558,328 +561,360 @@
public function save($finish_order = true)
{
-
- // Berechnen
- $arBasket = $this->toArray();
-
- // Keien Produkte nix speichern
- // Sonst wurden schon beim Betreten des leeren Warenkorb (Bots) leere Bestellungen erzeugt
- if (!wpsg_isSizedArray($arBasket['produkte'])) return;
-
- // Eintrag in Kundentabelle
- $data = array(
- 'title' => wpsg_q($this->arCheckout['title']),
- 'name' => wpsg_q($this->arCheckout['name']),
- 'vname' => wpsg_q($this->arCheckout['vname']),
- 'email' => wpsg_q($this->arCheckout['email']),
- 'firma' => wpsg_q($this->arCheckout['firma']),
- 'fax' => wpsg_q($this->arCheckout['fax']),
- 'strasse' => wpsg_q($this->arCheckout['strasse']),
- 'plz' => wpsg_q($this->arCheckout['plz']),
- 'ort' => wpsg_q($this->arCheckout['ort']),
- 'land' => wpsg_q($this->arCheckout['land']),
- 'tel' => wpsg_q($this->arCheckout['tel']),
- 'geb' => wpsg_q(wpsg_toDate($this->arCheckout['geb'])),
- 'ustidnr' => wpsg_q($this->arCheckout['ustidnr'])
- );
-
- $this->shop->callMods('basket_save_kunde', array(&$data, &$this->arCheckout));
-
- $saved_order_db = array();
-
- if (wpsg_isSizedInt($_SESSION['wpsg']['order_id']))
- {
-
- $saved_order_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_SESSION['wpsg']['order_id'])."' ");
-
- if ($saved_order_db['id'] != $_SESSION['wpsg']['order_id'])
- {
-
- // Wenn die Bestellung aus der Session nicht in der Datenbank existiert lege ich sie neu an
- unset($_SESSION['wpsg']['order_id']);
+
+ try
+ {
+
+ // Berechnen
+ $arBasket = $this->toArray();
+
+ // Keien Produkte nix speichern
+ // Sonst wurden schon beim Betreten des leeren Warenkorb (Bots) leere Bestellungen erzeugt
+ if (!wpsg_isSizedArray($arBasket['produkte'])) return;
+
+ // Eintrag in Kundentabelle
+ $data = array(
+ 'title' => wpsg_q($this->arCheckout['title']),
+ 'name' => wpsg_q($this->arCheckout['name']),
+ 'vname' => wpsg_q($this->arCheckout['vname']),
+ 'email' => wpsg_q($this->arCheckout['email']),
+ 'firma' => wpsg_q($this->arCheckout['firma']),
+ 'fax' => wpsg_q($this->arCheckout['fax']),
+ 'strasse' => wpsg_q($this->arCheckout['strasse']),
+ 'plz' => wpsg_q($this->arCheckout['plz']),
+ 'ort' => wpsg_q($this->arCheckout['ort']),
+ 'land' => wpsg_q($this->arCheckout['land']),
+ 'tel' => wpsg_q($this->arCheckout['tel']),
+ 'geb' => wpsg_q(wpsg_toDate($this->arCheckout['geb'])),
+ 'ustidnr' => wpsg_q($this->arCheckout['ustidnr'])
+ );
+
+ $this->shop->callMods('basket_save_kunde', array(&$data, &$this->arCheckout));
+
+ $saved_order_db = array();
+
+ if (wpsg_isSizedInt($_SESSION['wpsg']['order_id']))
+ {
+
+ $saved_order_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_SESSION['wpsg']['order_id'])."' ");
+
+ if ($saved_order_db['id'] != $_SESSION['wpsg']['order_id'])
+ {
+
+ // Wenn die Bestellung aus der Session nicht in der Datenbank existiert lege ich sie neu an
+ unset($_SESSION['wpsg']['order_id']);
+
+ }
+ else
+ {
+
+ $k_id = $saved_order_db['k_id'];
+
+ }
+
+ }
+
+ // Sollte die ID des eingeloggten Kunden nicht mit der ID in der Bestellung passen
+ if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['id']))
+ {
+
+ if (wpsg_isSizedInt($k_id) && $k_id != $_SESSION['wpsg']['checkout']['id'])
+ {
+
+ $k_id = $_SESSION['wpsg']['checkout']['id'];
+
+ }
+
+ }
+
+ $data['custom'] = array();
+ if (isset($this->arCheckout['custom']) && wpsg_isSizedArray($this->arCheckout)) $data['custom'] = $this->arCheckout['custom'];
+
+ if ($k_id > 0)
+ {
+
+ // Kunde existiert bereits, hier muss aufgepasst werden dass nur abgefragte Kundenvariablen ersetzt werden
+ $kunde_data = $this->shop->cache->loadKunden($k_id);
+ $custom_old = @unserialize($kunde_data['custom']);
+
+ if (wpsg_isSizedArray($custom_old))
+ {
+
+ $data['custom'] = wpsg_array_merge($custom_old, (array)$this->arCheckout['custom']);
+
+ }
+
+ }
+
+ $data['custom'] = serialize($data['custom']);
+
+ if ($k_id > 0)
+ {
+
+ $this->db->UpdateQuery(WPSG_TBL_KU, $data, "`id` = '".wpsg_q($k_id)."'");
+ $knr = $this->db->fetchOne("SELECT `knr` FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($k_id)."'");
+
+ $this->shop->callMods('customer_updatePwd', array(&$k_id, &$this->arCheckout['password']));
+ $this->shop->callMods('customer_updated', array(&$k_id));
}
else
{
-
- $k_id = $saved_order_db['k_id'];
-
- }
-
- }
-
- // Sollte die ID des eingeloggten Kunden nicht mit der ID in der Bestellung passen
- if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['id']))
- {
-
- if (wpsg_isSizedInt($k_id) && $k_id != $_SESSION['wpsg']['checkout']['id'])
- {
-
- $k_id = $_SESSION['wpsg']['checkout']['id'];
-
- }
-
- }
-
- $data['custom'] = array();
- if (isset($this->arCheckout['custom']) && wpsg_isSizedArray($this->arCheckout)) $data['custom'] = $this->arCheckout['custom'];
-
- if ($k_id > 0)
- {
-
- // Kunde existiert bereits, hier muss aufgepasst werden dass nur abgefragte Kundenvariablen ersetzt werden
- $kunde_data = $this->shop->cache->loadKunden($k_id);
- $custom_old = @unserialize($kunde_data['custom']);
-
- if (wpsg_isSizedArray($custom_old))
- {
-
- $data['custom'] = wpsg_array_merge($custom_old, (array)$this->arCheckout['custom']);
-
- }
-
- }
-
- $data['custom'] = serialize($data['custom']);
-
- if ($k_id > 0)
- {
-
- $this->db->UpdateQuery(WPSG_TBL_KU, $data, "`id` = '".wpsg_q($k_id)."'");
- $knr = $this->db->fetchOne("SELECT `knr` FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($k_id)."'");
-
- $this->shop->callMods('customer_updatePwd', array(&$k_id, &$this->arCheckout['password']));
- $this->shop->callMods('customer_updated', array(&$k_id));
-
- }
- else
- {
-
- if ($this->shop->hasMod('wpsg_mod_customergroup'))
- {
-
- if (wpsg_isSizedInt($this->shop->get_option('wpsg_page_mod_kundenverwaltung_group_checkout'))) $data['group_id'] = $this->shop->get_option('wpsg_page_mod_kundenverwaltung_group_checkout');
-
- }
-
- $k_id = $this->db->ImportQuery(WPSG_TBL_KU, $data);
- $knr = $this->shop->buildKNR($k_id);
-
- $this->db->UpdateQuery(WPSG_TBL_KU, array(
- 'knr' => wpsg_q($knr)
- ), "`id` = '".wpsg_q($k_id)."'");
-
- $this->shop->callMods('customer_created', array(&$k_id, &$this->arCheckout['password']));
-
- }
-
- $arBasket['checkout']['k_id'] = $k_id;
- $arBasket['checkout']['knr'] = $knr;
-
- // Der Kunde ist ab 14.08.2015 nicht mehr angemeldet
- //$_SESSION['wpsg']['checkout']['id'] = wpsg_xss($k_id);
-
- // Produkte letztmalig ÃŒberprÃŒfen
- foreach ($arBasket['produkte'] as $p_id => &$p)
- {
-
- if ($this->shop->hasMod('wpsg_mod_stock'))
- {
-
- if (!$this->shop->callMod('wpsg_mod_stock', 'checkBestand', array($p['id'], $p['menge'])) && $this->shop->get_option('wpsg_mod_stock_allow') == '1')
- {
-
- $p['menge'] = $this->shop->callMod('wpsg_mod_stock', 'getBestand', array($p['id']));
-
- }
-
- }
-
- }
+
+ if ($this->shop->hasMod('wpsg_mod_customergroup'))
+ {
+
+ if (wpsg_isSizedInt($this->shop->get_option('wpsg_page_mod_kundenverwaltung_group_checkout'))) $data['group_id'] = $this->shop->get_option('wpsg_page_mod_kundenverwaltung_group_checkout');
+
+ }
+
+ $k_id = $this->db->ImportQuery(WPSG_TBL_KU, $data);
+ $knr = $this->shop->buildKNR($k_id);
+
+ $this->db->UpdateQuery(WPSG_TBL_KU, array(
+ 'knr' => wpsg_q($knr)
+ ), "`id` = '".wpsg_q($k_id)."'");
- $data = array(
- 'cdate' => 'NOW()',
- 'k_id' => $k_id,
- 'ip' => wpsg_q($_SERVER['REMOTE_ADDR']),
- 'useragent' => wpsg_q($_SERVER['HTTP_USER_AGENT']),
- 'comment' => wpsg_q($this->arCheckout['comment']),
- 'price_gesamt' => wpsg_tf(round($arBasket['sum']['preis_gesamt_brutto'], 2)),
- 'price_gesamt_netto' => wpsg_tf(round($arBasket['sum']['preis_gesamt_netto'], 2)),
- 'price_gesamt_brutto' => wpsg_tf(round($arBasket['sum']['preis_gesamt_brutto'], 2)),
- 'price_shipping' => wpsg_tf($arBasket['sum']['preis_shipping']), // Sollte mal entfernt werden, wird aber an 1000 Stellen verwendet
- 'price_shipping_netto' => wpsg_tf($arBasket['sum']['preis_shipping_netto']),
- 'price_shipping_brutto' => wpsg_tf($arBasket['sum']['preis_shipping_brutto']),
- 'price_payment' => wpsg_tf($arBasket['sum']['preis_payment']), // Sollte mal entfernt wedren, wird aber an 1000 Stellen verwendet
- 'price_payment_netto' => wpsg_tf($arBasket['sum']['preis_payment_netto']),
- 'price_payment_brutto' => wpsg_tf($arBasket['sum']['preis_payment_brutto']),
- 'price_rabatt' => wpsg_tf($arBasket['sum']['preis_rabatt']),
- 'mwst_payment' => wpsg_tf($arBasket['payment']['preis_payment_brutto'] - $arBasket['payment']['preis_payment_netto']),
- 'mwst_shipping' => wpsg_tf($arBasket['shipping']['preis_shipping_brutto'] - $arBasket['shipping']['preis_shipping_netto']),
- 'type_shipping' => wpsg_q($this->arCheckout['shipping']),
- 'type_payment' => wpsg_q($this->arCheckout['payment']),
- 'custom_data' => array(
- 'basket' => $arBasket,
- 'preis_backend' => $this->shop->get_option('wpsg_preisangaben'),
- 'preis_frontend' => $this->shop->getFrontendTaxview(),
- 'wpsg_kleinunternehmer' => $this->shop->get_option('wpsg_kleinunternehmer'),
- 'wpsg_kleinunternehmer_text' => $this->shop->get_option('wpsg_kleinunternehmer_text')
- )
- );
-
- if ($finish_order === true) $data['status'] = wpsg_ShopController::STATUS_EINGEGANGEN;
- else $data['status'] = wpsg_ShopController::STATUS_UNVOLLSTAENDIG;
-
- // Sprache des Nutzers speichern
- if ($this->shop->isOtherLang())
- {
-
- $data['language'] = wpsg_q($this->shop->getCurrentLanguage());
-
- }
-
- /** Gutschein speichern */
- if ($this->gs_id !== false && $this->gs_id > 0)
- {
-
- $gs_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_GUTSCHEIN."` WHERE `id` = '".wpsg_q($this->gs_id)."'");
-
- if ($gs_db['id'] != $this->gs_id) die(__('Unerwarteter Fehler bei Gutscheinzuordnung.', 'wpsg'));
-
- $data['gs_id'] = wpsg_q($this->gs_id);
- $data['price_gs'] = wpsg_q($arBasket['sum']['gs']);
-
- }
-
- $this->shop->callMods('basket_save_order', array(&$data, &$this->arCheckout, &$arBasket, $finish_order));
-
- $data['custom_data'] = wpsg_q(serialize($data['custom_data']));
-
- if (wpsg_isSizedInt($_SESSION['wpsg']['order_id']))
- {
-
- $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, " `id` = '".wpsg_q($_SESSION['wpsg']['order_id'])."' ");
-
- $o_id = $_SESSION['wpsg']['order_id'];
- $o_nr = $saved_order_db['onr'];
-
- }
- else
- {
-
- $o_id = $this->db->ImportQuery(WPSG_TBL_ORDER, $data);
- $o_nr = $this->shop->buildONR($o_id, $k_id, $knr);
-
- // Bestellnummer speichern
- $this->db->UpdateQuery(WPSG_TBL_ORDER, array(
- 'onr' => wpsg_q($o_nr)
- ), "`id` = '".wpsg_q($o_id)."'");
-
- }
-
- $arBasket['checkout']['onr'] = $o_nr;
- $arBasket['checkout']['o_id'] = $o_id;
- $arBasket['checkout']['datum'] = strtotime($this->db->fetchOne("SELECT `cdate` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($o_id)."'"));
-
- if ($finish_order === true)
- {
-
- /** Gutschein der Bestellung zuordnen */
+ $this->shop->callMods('customer_created', array(&$k_id, &$this->arCheckout['password']));
+
+ }
+
+ $arBasket['checkout']['k_id'] = $k_id;
+ $arBasket['checkout']['knr'] = $knr;
+
+ // Der Kunde ist ab 14.08.2015 nicht mehr angemeldet
+ //$_SESSION['wpsg']['checkout']['id'] = wpsg_xss($k_id);
+
+ // Produkte letztmalig ÃŒberprÃŒfen
+ foreach ($arBasket['produkte'] as $p_id => &$p)
+ {
+
+ if ($this->shop->hasMod('wpsg_mod_stock'))
+ {
+
+ if (!$this->shop->callMod('wpsg_mod_stock', 'checkBestand', array($p['id'], $p['menge'])) && $this->shop->get_option('wpsg_mod_stock_allow') == '1')
+ {
+
+ $p['menge'] = $this->shop->callMod('wpsg_mod_stock', 'getBestand', array($p['id']));
+
+ }
+
+ }
+
+ }
+
+ $data = array(
+ 'cdate' => 'NOW()',
+ 'k_id' => $k_id,
+ 'ip' => wpsg_q($_SERVER['REMOTE_ADDR']),
+ 'useragent' => wpsg_q($_SERVER['HTTP_USER_AGENT']),
+ 'comment' => wpsg_q($this->arCheckout['comment']),
+ 'price_gesamt' => wpsg_tf(round($arBasket['sum']['preis_gesamt_brutto'], 2)),
+ 'price_gesamt_netto' => wpsg_tf(round($arBasket['sum']['preis_gesamt_netto'], 2)),
+ 'price_gesamt_brutto' => wpsg_tf(round($arBasket['sum']['preis_gesamt_brutto'], 2)),
+ 'price_shipping' => wpsg_tf($arBasket['sum']['preis_shipping']), // Sollte mal entfernt werden, wird aber an 1000 Stellen verwendet
+ 'price_shipping_netto' => wpsg_tf($arBasket['sum']['preis_shipping_netto']),
+ 'price_shipping_brutto' => wpsg_tf($arBasket['sum']['preis_shipping_brutto']),
+ 'price_payment' => wpsg_tf($arBasket['sum']['preis_payment']), // Sollte mal entfernt wedren, wird aber an 1000 Stellen verwendet
+ 'price_payment_netto' => wpsg_tf($arBasket['sum']['preis_payment_netto']),
+ 'price_payment_brutto' => wpsg_tf($arBasket['sum']['preis_payment_brutto']),
+ 'price_rabatt' => wpsg_tf($arBasket['sum']['preis_rabatt']),
+ 'mwst_payment' => wpsg_tf($arBasket['payment']['preis_payment_brutto'] - $arBasket['payment']['preis_payment_netto']),
+ 'mwst_shipping' => wpsg_tf($arBasket['shipping']['preis_shipping_brutto'] - $arBasket['shipping']['preis_shipping_netto']),
+ 'type_shipping' => wpsg_q($this->arCheckout['shipping']),
+ 'type_payment' => wpsg_q($this->arCheckout['payment']),
+ 'custom_data' => array(
+ 'basket' => $arBasket,
+ 'preis_backend' => $this->shop->get_option('wpsg_preisangaben'),
+ 'preis_frontend' => $this->shop->getFrontendTaxview(),
+ 'wpsg_kleinunternehmer' => $this->shop->get_option('wpsg_kleinunternehmer'),
+ 'wpsg_kleinunternehmer_text' => $this->shop->get_option('wpsg_kleinunternehmer_text')
+ )
+ );
+
+ if ($finish_order === true) $data['status'] = wpsg_ShopController::STATUS_EINGEGANGEN;
+ else $data['status'] = wpsg_ShopController::STATUS_UNVOLLSTAENDIG;
+
+ // Sprache des Nutzers speichern
+ if ($this->shop->isOtherLang())
+ {
+
+ $data['language'] = wpsg_q($this->shop->getCurrentLanguage());
+
+ }
+
+ /** Gutschein speichern */
if ($this->gs_id !== false && $this->gs_id > 0)
{
-
- if ($gs_db['multi'] != '1')
- {
-
- $this->db->UpdateQuery(WPSG_TBL_GUTSCHEIN, array('o_id' => $o_id), "`id` = '".wpsg_q($this->gs_id)."'");
-
- }
-
- }
-
- $this->shop->cache->clearOrderCache($o_id);
- $this->shop->cache->clearKundenCache($k_id);
-
- }
-
- // DB bereinigen und alte zur Bestellung gespeicherte Produkte löschen
- $this->db->Query("DELETE FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($o_id)."' ");
-
- // Produkte eintragen
- foreach ($arBasket['produkte'] as $p_id => &$p)
- {
-
- // Aufdröselung der Varianten damit in der DB die korrekt Produkt ID steht
- $produkt_id = $this->shop->getProduktID($p['id']);
-
- $data = array(
- 'o_id' => wpsg_q($o_id),
- 'p_id' => wpsg_q($produkt_id),
- 'productkey' => $p['id'],
- 'product_index' => $p_id,
- 'menge' => wpsg_q($p['menge']),
- 'price' => wpsg_q($p['preis_brutto']),
- 'price_netto' => wpsg_q(wpsg_tf($p['preis_netto'])),
- 'price_brutto' => wpsg_q(wpsg_tf($p['preis_brutto'])),
- 'mwst_key' => wpsg_q($p['mwst_key']),
- 'mwst_value' => wpsg_q(wpsg_tf($p['preis_brutto'] - $p['preis_netto'])),
- 'mod_vp_varkey' => wpsg_q($p['productkey']),
- 'allowedpayments' => wpsg_q($p['allowedpayments']),
- 'allowedshipping' => wpsg_q($p['allowedshipping'])
- );
-
- $this->shop->callMods('basket_save_product', array(&$data, &$p, $finish_order));
-
- $this->db->ImportQuery(WPSG_TBL_ORDERPRODUCT, $data);
-
- // Eventuelle URL Benachrichtigung bei Kauf
+
+ $gs_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_GUTSCHEIN."` WHERE `id` = '".wpsg_q($this->gs_id)."'");
+
+ if ($gs_db['id'] != $this->gs_id) die(__('Unerwarteter Fehler bei Gutscheinzuordnung.', 'wpsg'));
+
+ $data['gs_id'] = wpsg_q($this->gs_id);
+ $data['price_gs'] = wpsg_q($arBasket['sum']['gs']);
+
+ }
+
+ $this->shop->callMods('basket_save_order', array(&$data, &$this->arCheckout, &$arBasket, $finish_order));
+
+ $data['custom_data'] = wpsg_q(serialize($data['custom_data']));
+
+ if (wpsg_isSizedInt($_SESSION['wpsg']['order_id']))
+ {
+
+ $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, " `id` = '".wpsg_q($_SESSION['wpsg']['order_id'])."' ");
+
+ $o_id = $_SESSION['wpsg']['order_id'];
+ $o_nr = $saved_order_db['onr'];
+
+ }
+ else
+ {
+
+ $o_id = $this->db->ImportQuery(WPSG_TBL_ORDER, $data);
+ $o_nr = $this->shop->buildONR($o_id, $k_id, $knr);
+
+ // Bestellnummer speichern
+ $this->db->UpdateQuery(WPSG_TBL_ORDER, array(
+ 'onr' => wpsg_q($o_nr)
+ ), "`id` = '".wpsg_q($o_id)."'");
+
+ }
+
+ $arBasket['checkout']['onr'] = $o_nr;
+ $arBasket['checkout']['o_id'] = $o_id;
+ $arBasket['checkout']['datum'] = strtotime($this->db->fetchOne("SELECT `cdate` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($o_id)."'"));
+
if ($finish_order === true)
{
- $produkt_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'");
-
- if ($produkt_db['posturl'] != '' && $produkt_db['posturl_verkauf'] == '1')
- {
-
- $this->shop->notifyURL($produkt_db['posturl'], $p['id'], $p['menge'], $o_id, 0, false, array(
- 'product_index' => $p_id
- ));
-
- }
-
- }
-
- }
-
- if ($finish_order === true)
- {
-
- $this->shop->callMods('basket_save_done', array(&$o_id, &$k_id, &$this));
- $this->shop->callMods('basket_save_done_array', array(&$o_id, &$k_id, &$arBasket));
-
- // Wenn CrefoPay aktiv, werden die Mails spÀter versendet
- if (!$this->shop->hasMod('wpsg_mod_crefopay')) $this->sendOrderSaveMails($o_id, $arBasket);
-
- // Bestellung direkt auf "Zahlung akzeptiert setzen" wenn option aktiv ist
- if ($this->shop->get_option('wpsg_emptyorder_clear') == '1' && $arBasket['sum']['preis_gesamt_brutto'] == 0)
- {
-
- $this->shop->setOrderStatus($o_id, 100, true);
-
- }
-
- // Alte BestellID muss nach Abschluà entfernt werden
- unset($_SESSION['wpsg']['order_id']);
- unset($_SESSION['wpsg']['checkout']['payment_amount']);
- unset($_SESSION['wpsg']['checkout']['paymentId']);
- unset($_SESSION['wpsg']['checkout']['payer_id']);
-
- $this->clearSession();
-
- }
- else
- {
-
- $_SESSION['wpsg']['order_id'] = $o_id;
-
- }
+ /** Gutschein der Bestellung zuordnen */
+ if ($this->gs_id !== false && $this->gs_id > 0)
+ {
+
+ if ($gs_db['multi'] != '1')
+ {
+
+ $this->db->UpdateQuery(WPSG_TBL_GUTSCHEIN, array('o_id' => $o_id), "`id` = '".wpsg_q($this->gs_id)."'");
+
+ }
+
+ }
+
+ $this->shop->cache->clearOrderCache($o_id);
+ $this->shop->cache->clearKundenCache($k_id);
+
+ }
+
+ // DB bereinigen und alte zur Bestellung gespeicherte Produkte löschen
+ $this->db->Query("DELETE FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($o_id)."' ");
+
+ // Produkte eintragen
+ foreach ($arBasket['produkte'] as $p_id => $p)
+ {
+
+ // Aufdröselung der Varianten damit in der DB die korrekt Produkt ID steht
+ $produkt_id = $this->shop->getProduktID($p['id']);
+
+ $data = array(
+ 'o_id' => wpsg_q($o_id),
+ 'p_id' => wpsg_q($produkt_id),
+ 'productkey' => $p['id'],
+ 'product_index' => $p_id,
+ 'menge' => wpsg_q($p['menge']),
+ 'price' => wpsg_q($p['preis_brutto']),
+ 'price_netto' => wpsg_q(wpsg_tf($p['preis_netto'])),
+ 'price_brutto' => wpsg_q(wpsg_tf($p['preis_brutto'])),
+ 'mwst_key' => wpsg_q($p['mwst_key']),
+ 'mwst_value' => wpsg_q(wpsg_tf($p['preis_brutto'] - $p['preis_netto'])),
+ 'mod_vp_varkey' => wpsg_q($p['productkey']),
+ 'allowedpayments' => wpsg_q($p['allowedpayments']),
+ 'allowedshipping' => wpsg_q($p['allowedshipping'])
+ );
+
+ // Hier wird der Lagerbestand final geschrieben, sollte ein Fehler ausgelöst werden soll zum Warenkorb geleitet werden
+ if ($finish_order === true && $this->shop->hasMod('wpsg_mod_stock'))
+ {
+
+ $p_stock = $p;
+ $bStockError = $this->shop->callMod('wpsg_mod_stock', 'checkReduceStock', array(&$data, &$p_stock));
+
+ if ($bStockError === false)
+ {
+
+ $this->shop->addFrontendError(__('Lagerbestand hat sich zwischenzeitlich geÀndert. Bitte Bestellung ÌberprÌfen.', 'wpsg'));
+ $this->shop->redirect($this->shop->getUrl(wpsg_ShopController::URL_BASKET));
+
+ }
+
+ }
+
+ $this->shop->callMods('basket_save_product', array(&$data, &$p, $finish_order));
+
+ $this->db->ImportQuery(WPSG_TBL_ORDERPRODUCT, $data);
+
+ // Eventuelle URL Benachrichtigung bei Kauf
+ if ($finish_order === true)
+ {
+
+ $produkt_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'");
+
+ if ($produkt_db['posturl'] != '' && $produkt_db['posturl_verkauf'] == '1')
+ {
+
+ $this->shop->notifyURL($produkt_db['posturl'], $p['id'], $p['menge'], $o_id, 0, false, array(
+ 'product_index' => $p_id
+ ));
+
+ }
+
+ }
+
+ }
+
+ if ($finish_order === true)
+ {
+
+ $this->shop->callMods('basket_save_done', array(&$o_id, &$k_id, &$this));
+ $this->shop->callMods('basket_save_done_array', array(&$o_id, &$k_id, &$arBasket));
+
+ // Wenn CrefoPay aktiv, werden die Mails spÀter versendet
+ if (!$this->shop->hasMod('wpsg_mod_crefopay')) $this->sendOrderSaveMails($o_id, $arBasket);
+
+ // Bestellung direkt auf "Zahlung akzeptiert setzen" wenn option aktiv ist
+ if ($this->shop->get_option('wpsg_emptyorder_clear') == '1' && $arBasket['sum']['preis_gesamt_brutto'] == 0)
+ {
+
+ $this->shop->setOrderStatus($o_id, 100, true);
+
+ }
+
+ // Alte BestellID muss nach Abschluà entfernt werden
+ unset($_SESSION['wpsg']['order_id']);
+ unset($_SESSION['wpsg']['checkout']['payment_amount']);
+ unset($_SESSION['wpsg']['checkout']['paymentId']);
+ unset($_SESSION['wpsg']['checkout']['payer_id']);
+
+ $this->clearSession();
+
+ }
+ else
+ {
+
+ $_SESSION['wpsg']['order_id'] = $o_id;
+
+ }
+
+ }
+ catch (Exception $e)
+ {
+
+ $this->db->unlockTables();
+
+ die($e->getMessage());
+
+ }
+
+ $this->db->unlockTables();
return $o_id;
@@ -950,10 +985,7 @@
// Geburtsdatum
if (
- $custom_config['geb'] == '0' && !wspg_isValidGeb($this->arCheckout['geb'])
-
- /*
- (wspg_isValidGeb($this->arCheckout['geb']) && wpsg_isSizedString($this->arCheckout['geb'])) ||
- $custom_config['geb'] == '0'
- * */
+ ($custom_config['geb'] != '1' && !wspg_isValidGeb($this->arCheckout['geb'])) ||
+ (wpsg_isSizedString($this->arCheckout['geb']) && !wspg_isValidGeb($this->arCheckout['geb']))
+
)
{
@@ -966,7 +998,10 @@
// E-Mail Adresse
- if ($custom_config['email'] != '1' && !wpsg_isValidEMail($this->arCheckout['email']))
- {
-
+ if (
+ ($custom_config['email'] != '1' && !wpsg_isValidEMail($this->arCheckout['email'])) ||
+ (wpsg_isSizedString($this->arCheckout['email']) && !wpsg_isValidEMail($this->arCheckout['email']))
+ )
+ {
+
$this->shop->addFrontendError(__('Bitte die Eingabe der E-Mail Adresse ÃŒberprÃŒfen!', 'wpsg'));
$_SESSION['wpsg']['errorFields'][] = 'email';
@@ -1133,5 +1168,5 @@
if (!isset($this->arCheckout['shipping']) || !array_key_exists($this->arCheckout['shipping'], $this->shop->arShipping) || $this->arCheckout['shipping'] == '')
{
-
+
$this->shop->addFrontendError(__('Bitte eine gÌltige Versandart auswÀhlen.', 'wpsg'));
$_SESSION['wpsg']['errorFields'][] = 'shipping';
@@ -1139,5 +1174,5 @@
}
-
+
// Zahlungsart prÃŒfen
if (!$this->shop->hasMod('wpsg_mod_crefopay'))
@@ -1147,7 +1182,13 @@
{
- $this->shop->addFrontendError(__('Bitte eine gÌltige Zahlungsart auswÀhlen.', 'wpsg'));
- $_SESSION['wpsg']['errorFields'][] = 'payment';
- $bError = true;
+ // Fake Zahlungsart PayPal Plus soll keinen Fehler schreiben
+ if ($this->arCheckout['payment'] != 'ppp')
+ {
+
+ $this->shop->addFrontendError(__('Bitte eine gÌltige Zahlungsart auswÀhlen.', 'wpsg'));
+ $_SESSION['wpsg']['errorFields'][] = 'payment';
+ $bError = true;
+
+ }
}
@@ -1237,4 +1278,5 @@
{
+ /*
if ($arBasket['noMwSt'] == '1')
{
@@ -1245,5 +1287,5 @@
else
{
-
+
if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO)
{
@@ -1260,4 +1302,5 @@
}
+ */
}
@@ -1270,21 +1313,31 @@
}
-
- // MwSt. Im Frontend nicht anzeigen, weil z.B. UstIDnr angegeben wurde
- if (wpsg_isSizedInt($this->arCheckout['shipping_land'])) $land = $this->shop->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->arCheckout['shipping_land'])."'");
- else if (wpsg_isSizedInt($this->arCheckout['land'])) $land = $this->shop->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->arCheckout['land'])."'");
- else $land = 0;
-
+
$arReturn = array();
-
- $arReturn['land'] = $land;
-
- if (wpsg_isSizedInt($this->arCheckout['shipping_land']))
- {
-
- $arReturn['shipping_land'] = $this->shop->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->arCheckout['shipping_land'])."'");
-
- }
-
+
+ if (wpsg_isSizedInt($this->arCheckout['land']))
+ {
+
+ $db_country_invoice = $this->shop->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->arCheckout['land'])."'");
+ $arReturn['land'] = $db_country_invoice;
+
+ if (wpsg_isSizedInt($this->arCheckout['shipping_land']))
+ {
+
+ $db_country_shipping = $this->shop->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->arCheckout['shipping_land'])."'");
+ $arReturn['shipping_land'] = $db_country_shipping;
+ $land = $db_country_shipping;
+
+ }
+ else
+ {
+
+ $db_country_shipping = $db_country_invoice;
+ $land = $db_country_shipping;
+
+ }
+
+ } else $land = 0;
+
if ($land['mwst'] == '1' || $this->shop->get_option('wpsg_kleinunternehmer') == '1') $noMwSt = true;
else if ($land['mwst'] == '2' && $this->arCheckout['ustidnr'] != '') $noMwSt = true;
@@ -1303,5 +1356,11 @@
'preis_shipping' => 0
);
-
+
+ // Hier sammel ich die Produktpreise
+ $arProductPrice = array(
+ WPSG_NETTO => array(),
+ WPSG_BRUTTO => array()
+ );
+
foreach ($this->arProdukte as $product_index => &$b)
{
@@ -1310,132 +1369,154 @@
wpsg_addSet($arReturn['menge'], $b['menge']);
-
+
$country = $this->shop->getDefaultCountry();
if (is_numeric($produkt_id))
{
-
+
// Preis wird berechnet daher entfernen
unset($b['preis']);
unset($b['preis_netto']);
unset($b['preis_brutto']);
-
+
// in $b sind eventuell auch Moduldaten drin (Produktvariablen)
$b = $this->shop->loadProduktArray($produkt_id, $b);
-
+
if (wpsg_isSizedInt($b['euleistungsortregel']))
{
-
+
$this->shop->showEULayer = true;
$country = $this->shop->getFrontendCountry();
-
- }
-
+
+ }
+
$b['productkey'] = $b['id'];
-
- }
-
- $this->shop->callMods('basket_toArray', array(&$b, $backend, $noMwSt));
-
+
+ }
+
+ $this->shop->callMods('basket_toArray', array(&$b, $backend, $noMwSt));
$this->checkMwSt($b['mwst_key'], $country, $arReturn);
-
+
+ if ($noMwSt)
+ {
+
+ $price_product_netto = $b['preis_netto'];
+ $price_product_brutto = $b['preis_netto'];
+
+ }
+ else
+ {
+
+ $price_product_netto = $b['preis_netto'];
+ $price_product_brutto = $b['preis_brutto'];
+
+ }
+
// Hier wird entschieden ob der gerundete oder der genaue Wert zum Gesamtpreis hinzuaddiert wird
- if ($this->shop->addRoundedValues === true)
- {
-
- $price_sum_brutto = round($b['preis_brutto'], 2);
- $price_sum_netto = round($b['preis_netto'], 2);
-
+ if ($this->shop->addRoundedValues === true)
+ {
+
+ $b['preis_netto'] = round($price_product_netto, 2);
+ $b['preis_brutto'] = round($price_product_brutto, 2);
+
}
else
{
-
- $price_sum_brutto = $b['preis_brutto'];
- $price_sum_netto = $b['preis_netto'];
-
- }
-
- if ($noMwSt) $b['mwst_value'] = 0;
- else $b['mwst_value'] = $arReturn['mwst'][$b['mwst_key'].'_'.$country->id]['value'];
-
- if (!$noMwSt) wpsg_addSet($arReturn['sum']['mwst'], (($price_sum_brutto - $price_sum_netto) * $b['menge']));
- else $arReturn['sum']['mwst'] = 0;
-
- if ($noMwSt)
- {
-
- $arReturn['sum']['preis_brutto'] += $price_sum_netto * $b['menge'];
- $arReturn['sum']['preis_gesamt_brutto'] += $price_sum_netto * $b['menge'];
-
- }
- else
- {
-
- $arReturn['sum']['preis_brutto'] += $price_sum_brutto * $b['menge'];
- $arReturn['sum']['preis_gesamt_brutto'] += $price_sum_brutto * $b['menge'];
-
- }
-
- $arReturn['sum']['preis_netto'] += $price_sum_netto * $b['menge'];
- $arReturn['sum']['preis_gesamt_netto'] += $price_sum_netto * $b['menge'];
-
- // Preis Spalte auswÀhlen
- if ($backend)
- {
-
- if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $noMwSt)
- {
-
- $b['preis'] = $price_sum_netto;
- $arReturn['sum']['preis'] += $price_sum_netto * $b['menge'];
- $arReturn['sum']['preis_gesamt'] += $price_sum_netto * $b['menge'];
-
- }
- else
- {
-
- $b['preis'] = $price_sum_brutto;
- $arReturn['sum']['preis'] += $price_sum_brutto * $b['menge'];
- $arReturn['sum']['preis_gesamt'] += $price_sum_brutto * $b['menge'];
-
- }
-
- }
- else
- {
-
- if ($this->shop->getFrontendTaxview() == WPSG_NETTO || $noMwSt)
- {
-
- $b['preis'] = $price_sum_netto;
- wpsg_addSet($arReturn['sum']['preis'], ($price_sum_netto * $b['menge']));
- wpsg_addSet($arReturn['sum']['preis_gesamt'], ($price_sum_netto * $b['menge']));
-
- }
- else
- {
-
- $b['preis'] = $price_sum_brutto;
- wpsg_addSet($arReturn['sum']['preis'], ($price_sum_brutto * $b['menge']));
- wpsg_addSet($arReturn['sum']['preis_gesamt'], ($price_sum_brutto * $b['menge']));
-
- }
-
- }
-
- // Steueranteil
- if (!$noMwSt)
- {
-
- wpsg_addSet($arReturn['mwst'][$b['mwst_key'].'_'.$country->id]['sum'], (($price_sum_brutto - $price_sum_netto) * $b['menge']));
- wpsg_addSet($arReturn['mwst'][$b['mwst_key'].'_'.$country->id]['base_value'], ($price_sum_brutto * $b['menge']));
-
- }
-
+
+ $b['preis_netto'] = $price_product_netto;
+ $b['preis_brutto'] = $price_product_brutto;
+
+ }
+
+ $price_sum_netto = $b['preis_netto'] * $b['menge'];
+ $price_sum_brutto = $b['preis_brutto'] * $b['menge'];
+
+ if ($this->shop->getFrontendTaxView() == WPSG_NETTO) $b['preis'] = round($b['preis_netto'], 2);
+ else $b['preis'] = round($b['preis_brutto'], 2);
+
+ $arProductPrice[WPSG_NETTO][$b['mwst_key'].'_'.$country->id][] = $price_sum_netto;
+ $arProductPrice[WPSG_BRUTTO][$b['mwst_key'].'_'.$country->id][] = $price_sum_brutto;
+
$b['product_index'] = $product_index;
$arReturn['produkte'][$product_index] = $b;
-
+
} // foreach Produkte
+ // Die Basis der Preisberechnung, wenn Brutto, dann wird Netto berechnet
+ if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
+ {
+
+ $base = WPSG_NETTO;
+ $calc = WPSG_BRUTTO;
+
+ }
+ else
+ {
+
+ $base = WPSG_BRUTTO;
+ $calc = WPSG_NETTO;
+
+ }
+
+ // Jetzt die jeweilige Steuer berechnen, damit die Anzeige stimmt
+ foreach ($arProductPrice[$base] as $tax_key_lang => $tax)
+ {
+
+ $arTaxKey = explode('_', $tax_key_lang);
+ $country_id = $arTaxKey[1];
+ $country = wpsg_country::getInstance($country_id);
+ $tax_key = $arTaxKey[0];
+
+ if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key);
+
+ $sum_tax_value = round(wpsg_calculateSteuer(array_sum($tax), $base, $tax_value), 2);
+
+ wpsg_addSet($arReturn['sum']['mwst'], $sum_tax_value);
+
+ if ($calc === WPSG_NETTO)
+ {
+
+ $sum_netto = round(wpsg_calculatePreis(array_sum($tax), WPSG_NETTO, $tax_value), 2);
+ $sum_brutto = array_sum($tax);
+
+ }
+ else
+ {
+
+ $sum_netto = array_sum($tax);
+ $sum_brutto = round(wpsg_calculatePreis(array_sum($tax), WPSG_BRUTTO, $tax_value), 2);
+
+ }
+
+ wpsg_addSet($arReturn['sum']['preis_netto'], $sum_netto);
+ wpsg_addSet($arReturn['sum']['preis_gesamt_netto'], $sum_netto);
+ wpsg_addSet($arReturn['sum']['preis_brutto'], $sum_brutto);
+ wpsg_addSet($arReturn['sum']['preis_gesamt_brutto'], $sum_brutto);
+
+ if (!$noMwSt)
+ {
+
+ wpsg_addSet($arReturn['mwst'][$tax_key_lang]['sum'], $sum_tax_value);
+ wpsg_addSet($arReturn['mwst'][$tax_key_lang]['base_value'], $sum_brutto);
+
+ }
+
+ }
+
+ if ($base === WPSG_NETTO)
+ {
+
+ wpsg_addSet($arReturn['sum']['preis'], $arReturn['sum']['preis_netto']);
+ wpsg_addSet($arReturn['sum']['preis_gesamt'], $arReturn['sum']['preis_gesamt_netto']);
+
+ }
+ else
+ {
+
+ wpsg_addSet($arReturn['sum']['preis'], $arReturn['sum']['preis_brutto']);
+ wpsg_addSet($arReturn['sum']['preis_gesamt'], $arReturn['sum']['preis_gesamt_brutto']);
+
+ }
+
// Gutschein einberechnen
$this->shop->callMod('wpsg_mod_gutschein', 'basket_toArray_gs', array(&$this, &$arReturn));
@@ -1448,5 +1529,5 @@
$this->shop->callMods('basket_toArray_preshippayment', array(&$this, &$arReturn));
-
+
// Die Versandkosten fÃŒr den Warenkorb berechnen berechnen
// Dies darf im checkout2 nicht passieren, oder wenn der Parameter auf true
@@ -1515,5 +1596,5 @@
// Versandarten können gruppiert sein, vorher trennen
- if (preg_match('/(.*)\-(.*)/', $arReturn['checkout']['shipping']))
+ if (wpsg_isSizedString($arReturn['checkout']['shipping']) && preg_match('/(.*)\-(.*)/', $arReturn['checkout']['shipping']))
{
Index: /lib/wpsg_basket_widget.class.php
===================================================================
--- /lib/wpsg_basket_widget.class.php (revision 5371)
+++ /lib/wpsg_basket_widget.class.php (revision 5382)
@@ -44,5 +44,6 @@
function form($instance)
{
-
+
+ if (isset($instance['wpsg_requestpage'])) { $wpsg_requestpage = $instance['wpsg_requestpage']; } else { $wpsg_requestpage = 0; }
if (isset($instance['wpsg_agbpage'])) { $wpsg_agbpage = $instance['wpsg_agbpage']; } else { $wpsg_agbpage = 0; }
if (isset($instance['wpsg_wrpage'])) { $wpsg_wrpage = $instance['wpsg_wrpage']; } else { $wpsg_wrpage = 0; }
@@ -57,4 +58,5 @@
:
+
@@ -78,4 +80,5 @@
$instance = array();
+ $instance['wpsg_requestpage'] = $new_instance['wpsg_requestpage'];
$instance['wpsg_agbpage'] = $new_instance['wpsg_agbpage'];
$instance['wpsg_wrpage'] = $new_instance['wpsg_wrpage'];
Index: /lib/wpsg_cache.class.php
===================================================================
--- /lib/wpsg_cache.class.php (revision 5371)
+++ /lib/wpsg_cache.class.php (revision 5382)
@@ -50,9 +50,9 @@
$this->_arOrder[$order_id] = $this->_db->fetchRow("
SELECT
- O.*
+ *
FROM
- `".WPSG_TBL_ORDER."` AS O
+ `".WPSG_TBL_ORDER."`
WHERE
- O.`id` = '".wpsg_q($order_id)."'
+ `id` = '".wpsg_q($order_id)."'
");
@@ -136,9 +136,9 @@
$this->_arProducts[$product_id] = $this->_db->fetchRow("
SELECT
- P.*
+ *
FROM
- `".WPSG_TBL_PRODUCTS."` AS P
+ `".WPSG_TBL_PRODUCTS."`
WHERE
- P.`id` = '".wpsg_q($product_id)."'
+ `id` = '".wpsg_q($product_id)."'
");
@@ -205,9 +205,9 @@
$this->_arKunden[$kunde_id] = $this->_db->fetchRow("
SELECT
- K.*
+ *
FROM
- `".WPSG_TBL_KU."` AS K
+ `".WPSG_TBL_KU."`
WHERE
- K.`id` = '".wpsg_q($kunde_id)."'
+ `id` = '".wpsg_q($kunde_id)."'
");
Index: /lib/wpsg_db.class.php
===================================================================
--- /lib/wpsg_db.class.php (revision 5371)
+++ /lib/wpsg_db.class.php (revision 5382)
@@ -285,4 +285,14 @@
} // function Query($strQuery)
+
+ /**
+ * Entsperrt alle Tabellen
+ */
+ function unlockTables()
+ {
+
+ $this->Query("UNLOCK TABLES");
+
+ } // function unlockTables()
} // class wpsg_db
Index: /lib/wpsg_fpdf.class.php
===================================================================
--- /lib/wpsg_fpdf.class.php (revision 5371)
+++ /lib/wpsg_fpdf.class.php (revision 5382)
@@ -3,7 +3,8 @@
class wpsg_fpdf extends FPDI
{
-
+
+ var $noHeader = false;
var $extgstates;
-
+
public function Text($x, $y, $text)
{
@@ -12,18 +13,20 @@
}
+
+ public function Cell($w, $h = 0, $text = '', $border = 0, $ln = 0, $align = '', $fill = 0, $link = '')
+ {
- public function Cell($w, $h, $text, $border, $ln, $align, $fill = 0)
- {
-
- parent::Cell($w, $h, $this->toIso($text), $border, $ln, $align, $fill);
-
- }
-
- public function MultiCell($x, $y, $h, $txt, $border = 0, $align = 'L', $fill = 0, $width = 0)
- {
-
+ return parent::Cell($w, $h, $this->toIso($text), $border, $ln, $align, $fill, $link);
+
+ }
+
+ public function wpsg_MultiCell($x, $y, $h, $txt, $border = 0, $align = 'L', $fill = 0, $width = 0)
+ {
+
// MultiCell(float w , float h , string txt [, mixed border] [, string align] [, integer fill])
parent::setXY($x, $y);
- parent::MultiCell($width, $h, $this->toIso($txt), $border, $align, $fill);
+
+ // Hier kein toISO weil intern wieder Cell aufgerufen wird
+ parent::MultiCell($width, $h, $txt, $border, $align, $fill);
$height = $this->getY() - $y;
@@ -33,5 +36,5 @@
}
- public function SetTextColor($strHEXCode)
+ public function wpsg_SetTextColor($strHEXCode)
{
@@ -54,5 +57,5 @@
parent::setTextColor($r, $g, $b);
- } // public function SetTextColor($strHEXCode)
+ } // public function wpsg_SetTextColor($strHEXCode)
function Rotate($angle,$x=-1,$y=-1)
@@ -218,7 +221,13 @@
{
+ /* Alternative:
+ $value = utf8_decode($value);
+ $value = str_replace("â¬", chr(128), $value);
+ $value = str_replace(utf8_decode("â¬"), chr(128), $value);
+ */
+
$value = str_replace("â¬", '€', $value);
$value = utf8_decode($value);
- $value = str_replace("€", chr(128), $value);
+ $value = str_replace("€", chr(128), $value);
return $value;
Index: /model/wpsg_customer.class.php
===================================================================
--- /model/wpsg_customer.class.php (revision 5371)
+++ /model/wpsg_customer.class.php (revision 5382)
@@ -15,5 +15,5 @@
parent::load($customer_id);
- $this->data = $this->db->fetchRow("SELECT K.* FROM `".WPSG_TBL_KU."` AS K WHERE K.`id` = '".wpsg_q($customer_id)."' ");
+ $this->data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($customer_id)."' ");
return true;
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php (revision 5371)
+++ /model/wpsg_product.class.php (revision 5382)
@@ -47,4 +47,20 @@
} // public function load($product_id)
+ public function delete()
+ {
+
+ $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array(
+ 'deleted' => '1'
+ ), "`id` = '".wpsg_q($this->id)."'");
+
+ $this->shop->callMods('produkt_del', array($this->id));
+
+ // Ãbersetzung löschen
+ $this->db->UpdateQuerY(WPSG_TBL_PRODUCTS, array(
+ 'deleted' => '1'
+ ), "`lang_parent` = '".wpsg_q($this->id)."'");
+
+ } // public function delete()
+
/**
* Setzt einen Wert in der META Tabelle
Index: /mods/mod_abo/demo_notification.php
===================================================================
--- /mods/mod_abo/demo_notification.php (revision 5371)
+++ /mods/mod_abo/demo_notification.php (revision 5382)
@@ -34,5 +34,5 @@
/* Shop Plugin initiieren */
- require_once($path_wp_root.'wp-content/plugins/wpshopgermany/wpshopgermany.php');
+ require_once($path_wp_root.'wp-content/plugins/'.WPSG_FOLDERNAME.'/wpshopgermany.php');
if ($_REQUEST['typ'] == 'abo_firstbuy')
Index: /mods/mod_downloadplus/wpsg_fpdf.php
===================================================================
--- /mods/mod_downloadplus/wpsg_fpdf.php (revision 5371)
+++ /mods/mod_downloadplus/wpsg_fpdf.php (revision 5382)
@@ -26,5 +26,5 @@
parent::FPDF($orientation, $unit, $format);
- /* Code 128 */
+ /* Code 128 */
$this->T128[] = array(2, 1, 2, 2, 2, 2); //0 : [ ] // composition des caractÚres
$this->T128[] = array(2, 2, 2, 1, 2, 2); //1 : [!]
@@ -176,7 +176,32 @@
}
-
+
+ public function wpsg_SetTextColor($strHEXCode)
+ {
+
+ error_reporting(E_ERROR);
+
+ if ($strHEXCode[0] == '#')
+ $strHEXCode = substr($strHEXCode, 1);
+
+ if (strlen($strHEXCode) == 6)
+ list($r, $g, $b) = array($strHEXCode[0].$strHEXCode[1],
+ $strHEXCode[2].$strHEXCode[3],
+ $strHEXCode[4].$strHEXCode[5]);
+ elseif (strlen($strHEXCode) == 3)
+ list($r, $g, $b) = array($strHEXCode[0].$strHEXCode[0], $strHEXCode[1].$strHEXCode[1], $strHEXCode[2].$strHEXCode[2]);
+ else
+ return false;
+
+ $r = hexdec($r); $g = hexdec($g); $b = hexdec($b);
+
+ parent::setTextColor($r, $g, $b);
+
+ } // public function wpsg_SetTextColor($strHEXCode)
+
function Code128($x, $y, $code, $h)
{
+
+ $code = $this->clearCode($code);
$w = 5 * strlen($code);
@@ -201,6 +226,10 @@
$crypt = "";
+ $break = 0;
+
while ($code > "")
{
+
+ $break ++;
// BOUCLE PRINCIPALE DE CODAGE
@@ -255,5 +284,5 @@
}
-
+
$madeB = strpos($Bguid,"N"); // étendu du set B
@@ -278,7 +307,17 @@
$Bguid = substr($Bguid,$made);
$Cguid = substr($Cguid,$made);
+
+ // Um Endlosschleifen zu verhindern
+ if ($break === 1000)
+ {
+
+ die("Code: ".$code." konnte nicht in EAN128 kodiert werden.");
+
+ break;
+
+ }
} // FIN BOUCLE PRINCIPALE
-
+
$check = ord($crypt[0]);
@@ -528,4 +567,21 @@
}
+ function clearCode($code)
+ {
+
+ $arReplace = array(
+ '/Ã/' => 'Ae',
+ '/À/' => 'ae',
+ '/Ã/' => 'Oe',
+ '/ö/' => 'oe',
+ '/Ã/' => 'Ue',
+ '/Ì/' => 'ue',
+ '/Ã/' => 'ss'
+ );
+
+ return preg_replace(array_keys($arReplace), array_values($arReplace), $code);
+
+ }
+
} // class wpsg_fpdf extends FPDI
Index: /mods/wpsg_mod_autodebit.class.php
===================================================================
--- /mods/wpsg_mod_autodebit.class.php (revision 5371)
+++ /mods/wpsg_mod_autodebit.class.php (revision 5382)
@@ -284,5 +284,5 @@
if (trim($arCheckout['mod_autodebit_bic']) == '') { $_SESSION['wpsg']['errorFields'][] = 'mod_autodebit_bic'; $this->shop->addFrontendError(__('Bitte die BIC der Bank kontrollieren (Bankeinzug)', 'wpsg')); $error = true; }
- if (trim($arCheckout['mod_autodebit_iban']) == '') { $_SESSION['wpsg']['errorFields'][] = 'mod_autodebit_iban'; $this->shop->addFrontendError(__('Bitet die IBAN Nr ÃŒberprÃŒfen (Bankeinzug)', 'wpsg')); $error = true; }
+ if (trim($arCheckout['mod_autodebit_iban']) == '') { $_SESSION['wpsg']['errorFields'][] = 'mod_autodebit_iban'; $this->shop->addFrontendError(__('Bitte die IBAN Nr ÃŒberprÃŒfen (Bankeinzug)', 'wpsg')); $error = true; }
}
@@ -298,5 +298,5 @@
} // public function checkCheckout(&$state, &$error, &$arCheckout)
-
+
public function basket_save_order(&$data, &$checkout, &$arBasket, $finish_order)
{
@@ -319,5 +319,5 @@
public function order_view_afterpayment(&$order_id)
{
-
+
$order_data = $this->shop->cache->loadOrder($order_id);
Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php (revision 5371)
+++ /mods/wpsg_mod_basic.class.php (revision 5382)
@@ -91,5 +91,6 @@
4000 => 'wpsg_mod_crefopay', /* Sollte die letzte Zahlungsart bleiben, da sie die anderen ausblendet */
3150 => 'wpsg_mod_request',
- 5000 => 'wpsg_mod_trustedshops' // Sollte nach den Zahlungsanbietern kommen wegen order_done
+ 5000 => 'wpsg_mod_trustedshops', // Sollte nach den Zahlungsanbietern kommen wegen order_done
+ 5100 => 'wpsg_mod_productview',
);
@@ -841,7 +842,7 @@
}
-
- $mwst_sum = 0;
-
+
+ $tax_sum = 0;
+
$tax_netto_gesamt = 0;
$tax_brutto_gesamt = 0;
Index: /mods/wpsg_mod_billsafe.class.php
===================================================================
--- /mods/wpsg_mod_billsafe.class.php (revision 5371)
+++ /mods/wpsg_mod_billsafe.class.php (revision 5382)
@@ -137,9 +137,9 @@
'mwst_null' => $this->shop->get_option('wpsg_mod_billsafe_mwstland'),
'hint' => __($this->shop->get_option('wpsg_mod_billsafe_hint')),
- 'logo' => WPSG_URL_CONTENT.'plugins/wpshopgermany/views/gfx/billsafe.png',
+ 'logo' => WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/views/gfx/billsafe.png',
'logo_100x25' => $this->shop->getRessourceURL('mods/mod_billsafe/gfx/logo_100x25.png')
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_cab.class.php
===================================================================
--- /mods/wpsg_mod_cab.class.php (revision 5371)
+++ /mods/wpsg_mod_cab.class.php (revision 5382)
@@ -166,8 +166,8 @@
'mwst_null' => $this->shop->get_option('wpsg_mod_cab_mwstland'),
'hint' => __($this->shop->get_option('wpsg_mod_cab_hint')),
- 'logo' => WPSG_URL_CONTENT.'plugins/wpshopgermany/views/gfx/cab.png'
+ 'logo' => WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/views/gfx/cab.png'
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_customergroup.class.php
===================================================================
--- /mods/wpsg_mod_customergroup.class.php (revision 5371)
+++ /mods/wpsg_mod_customergroup.class.php (revision 5382)
@@ -27,5 +27,5 @@
} // public function __construct()
-
+
public function install()
{
Index: /mods/wpsg_mod_debitpayment.class.php
===================================================================
--- /mods/wpsg_mod_debitpayment.class.php (revision 5371)
+++ /mods/wpsg_mod_debitpayment.class.php (revision 5382)
@@ -77,5 +77,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_deliverynote.class.php
===================================================================
--- /mods/wpsg_mod_deliverynote.class.php (revision 5371)
+++ /mods/wpsg_mod_deliverynote.class.php (revision 5382)
@@ -53,5 +53,5 @@
} // public function init()
-
+
public function install()
{
@@ -321,5 +321,10 @@
// Status setzen
- $this->shop->setOrderStatus($_REQUEST['edit_id'], $_REQUEST['wpsg_mod_deliverynote_status'], 0);
+ if (wpsg_isSizedInt($_REQUEST['wpsg_mod_deliverynote_setstatus']))
+ {
+
+ $this->shop->setOrderStatus($_REQUEST['edit_id'], $_REQUEST['wpsg_mod_deliverynote_status'], 0);
+
+ }
wpsg_header::PDFPlugin($file);
Index: /mods/wpsg_mod_deliverytime.class.php
===================================================================
--- /mods/wpsg_mod_deliverytime.class.php (revision 5371)
+++ /mods/wpsg_mod_deliverytime.class.php (revision 5382)
@@ -110,4 +110,6 @@
if ($this->shop->get_option('wpsg_mod_deliverytime_show_mail') != '1') return;
+ $this->shop->view['wpsg_mod_deliverytime']['i'] = $i;
+ $this->shop->view['wpsg_mod_deliverytime']['p'] = $p;
$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($produkt['id']));
@@ -132,4 +134,6 @@
if ($this->shop->get_option('wpsg_mod_deliverytime_show_basket') != '1') return;
+ $this->shop->view['wpsg_mod_deliverytime']['i'] = $i;
+ $this->shop->view['wpsg_mod_deliverytime']['p'] = $p;
$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($p['id']));
@@ -143,4 +147,7 @@
if ($this->shop->get_option('wpsg_mod_deliverytime_show_overview') != '1') return;
+
+ $this->shop->view['wpsg_mod_deliverytime']['i'] = $i;
+ $this->shop->view['wpsg_mod_deliverytime']['p'] = $p;
$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($p['id']));
@@ -185,5 +192,5 @@
{
- return $this->shop->get_option('wpsg_mod_deliverytime_mode_days_default').__(' Tage', 'wpsg');
+ return $this->shop->get_option('wpsg_mod_deliverytime_mode_days_default').__(' Tag(e)', 'wpsg');
}
@@ -191,5 +198,5 @@
{
- return $product_data['wpsg_mod_deliverytime_deliverytime'].__(' Tage', 'wpsg');
+ return $product_data['wpsg_mod_deliverytime_deliverytime'].__(' Tag(e)', 'wpsg');
}
Index: /mods/wpsg_mod_discount.class.php
===================================================================
--- /mods/wpsg_mod_discount.class.php (revision 5371)
+++ /mods/wpsg_mod_discount.class.php (revision 5382)
@@ -503,5 +503,5 @@
}
- else
+ else if ($discount)
{
@@ -528,5 +528,5 @@
$discount_tax = $this->shop->subMwSt($arReturn, $discount);
-
+
}
@@ -535,7 +535,19 @@
}
- $discount_brutto = $discount_value;
- $discount_netto = $discount_value - $discount_tax;
-
+ if ($this->shop->addRoundedValues === true)
+ {
+
+ $discount_brutto = round($discount_value, 2);
+ $discount_netto = round($discount_value - $discount_tax, 2);
+
+ }
+ else
+ {
+
+ $discount_brutto = $discount_value;
+ $discount_netto = $discount_value - $discount_tax;
+
+ }
+
$arReturn['sum']['preis_brutto'] -= $discount_brutto;
$arReturn['sum']['preis_netto'] -= $discount_netto;
@@ -909,5 +921,5 @@
// Zeitraum und gÃŒltigen Wert ÃŒberprÃŒfen
- if ($rabatt[0] != "1" || !preg_match("/\d{2}\.\d{2}\.\d{4}/", $rabatt[1]) || !preg_match("/\d{2}\.\d{2}\.\d{4}/", $rabatt[2]) || !is_float((float)$rabatt[3]))
+ if (!wpsg_isSizedArray($rabatt[0]) || $rabatt[0] != "1" || !preg_match("/\d{2}\.\d{2}\.\d{4}/", $rabatt[1]) || !preg_match("/\d{2}\.\d{2}\.\d{4}/", $rabatt[2]) || !is_float((float)$rabatt[3]))
{
Index: /mods/wpsg_mod_downloadplus.class.php
===================================================================
--- /mods/wpsg_mod_downloadplus.class.php (revision 5371)
+++ /mods/wpsg_mod_downloadplus.class.php (revision 5382)
@@ -28,5 +28,5 @@
} // public function __construct()
-
+
public function install()
{
@@ -928,6 +928,5 @@
{
- list($r, $g, $b) = wpsg_getColor($t["color"]);
- $pdf->SetTextColor($r, $g, $b);
+ $pdf->wpsg_SetTextColor($t["color"]);
$pdf->RotatedText(
@@ -997,6 +996,5 @@
{
- list($r, $g, $b) = wpsg_getColor($t["color"]);
- $pdf->SetTextColor($r, $g, $b);
+ $pdf->wpsg_SetTextColor($t["color"]);
$pdf->RotatedText(
Index: /mods/wpsg_mod_export.class.php
===================================================================
--- /mods/wpsg_mod_export.class.php (revision 5371)
+++ /mods/wpsg_mod_export.class.php (revision 5382)
@@ -626,5 +626,5 @@
$arOV = array();
- $arOrderVars = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `name` ASC ");
+ $arOrderVars = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `pos` ASC, `id` ASC ");
foreach ($arOrderVars as $ov)
Index: /mods/wpsg_mod_flexipay.class.php
===================================================================
--- /mods/wpsg_mod_flexipay.class.php (revision 5371)
+++ /mods/wpsg_mod_flexipay.class.php (revision 5382)
@@ -260,5 +260,5 @@
{
- if ($_REQUEST['wpsg_plugin'] != 'wpsg_mod_flexipay') return;
+ if (!wpsg_isSizedString($_REQUEST['wpsg_plugin'], 'wpsg_mod_flexipay')) return;
if ($_REQUEST['wpsg_action'] === 'checkStatus')
Index: /mods/wpsg_mod_fuellmenge.class.php
===================================================================
--- /mods/wpsg_mod_fuellmenge.class.php (revision 5371)
+++ /mods/wpsg_mod_fuellmenge.class.php (revision 5382)
@@ -56,5 +56,5 @@
$this->shop->update_option('wpsg_mod_fuellmenge_einheit', $_REQUEST['wpsg_mod_fuellmenge_einheit']);
$this->shop->update_option('wpsg_mod_fuellmenge_bezug', $_REQUEST['wpsg_mod_fuellmenge_bezug']);
-
+ $this->shop->update_option('wpsg_mod_fuellmenge_showAjaxDialog', $_REQUEST['wpsg_mod_fuellmenge_showAjaxDialog']);
if ($this->shop->hasMod('wpsg_mod_fuellmenge') == '1')
{
@@ -62,4 +62,5 @@
$this->shop->update_option('wpsg_mod_fuellmenge_showProductindex_fmenge', $_REQUEST['wpsg_mod_fuellmenge_showProductindex_fmenge']);
$this->shop->update_option('wpsg_mod_fuellmenge_showProductindex_grundpreis', $_REQUEST['wpsg_mod_fuellmenge_showProductindex_grundpreis']);
+
}
Index: /mods/wpsg_mod_gutschein.class.php
===================================================================
--- /mods/wpsg_mod_gutschein.class.php (revision 5371)
+++ /mods/wpsg_mod_gutschein.class.php (revision 5382)
@@ -24,5 +24,5 @@
} // public function __construct()
-
+
public function install()
{
Index: /mods/wpsg_mod_invoice_type.class.php
===================================================================
--- /mods/wpsg_mod_invoice_type.class.php (revision 5371)
+++ /mods/wpsg_mod_invoice_type.class.php (revision 5382)
@@ -70,5 +70,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php (revision 5371)
+++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 5382)
@@ -1643,5 +1643,5 @@
// Damit "Geisterkungen" aus unvollstÀndigen Bestellungen nicht erscheinen
- $strQueryWHERE .= " AND K.`email` != '' ";
+ //$strQueryWHERE .= " AND K.`email` != '' ";
$nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage');
@@ -1652,12 +1652,21 @@
$this->shop->view['count'] = $this->db->fetchOne("
SELECT
- COUNT(*)
- FROM
- `".WPSG_TBL_KU."` AS K
- WHERE
- 1
- ".$strQueryWHERE."
+ COUNT(*)
+ FROM
+ (
+ SELECT
+ K.`id`,
+ (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count,
+ (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete
+ FROM
+ `".WPSG_TBL_KU."` AS K
+ WHERE
+ 1
+ ".$strQueryWHERE."
+ HAVING
+ (order_count_incomplete = 0 OR order_count > 0)
+ ) AS OUTER_TABLE
");
-
+
$this->shop->view['seite'] = $seite;
$this->shop->view['pages'] = ceil($this->shop->view['count'] / $nPerPage);
@@ -1698,5 +1707,7 @@
else $strQueryORDERNR = " CAST(`knr` AS UNSIGNED) AS `order_nr` ";
- $this->shop->view['data'] = $this->db->fetchAssoc("
+ // Das HAVING ist so "kompliziert" weil ich erreichen wollte das Kunden die gÀnzlich keine Bestellungen haben denoch angezeigt werden
+ // Kunden die aber nur unvollstÀndige Bestellungen haben aber nicht
+ $strQuery = "
SELECT
K.*,
@@ -1705,5 +1716,6 @@
CONCAT(K.`vname`, ' ', K.`name`) AS `order_name`,
".$strQueryORDERNR.",
- (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id`) AS order_count,
+ (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count,
+ (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete,
(SELECT SUM(`price_gesamt`) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` IN (100, 110)) as order_umsatz
FROM
@@ -1711,12 +1723,16 @@
LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (K.`land` = L.`id`)
WHERE
- 1
+ 1
".$strQueryWHERE."
+ HAVING
+ (order_count_incomplete = 0 OR order_count > 0)
ORDER BY
".$strQueryORDER." ".wpsg_q($this->shop->view['filter']['ascdesc']).", K.`id` DESC
LIMIT
".(($this->shop->view['seite'] - 1) * $nPerPage).", ".$nPerPage."
- ");
-
+ ";
+
+ $this->shop->view['data'] = $this->db->fetchAssoc($strQuery);
+
// Kundengruppen laden
if ($this->shop->hasMod('wpsg_mod_customergroup'))
Index: /mods/wpsg_mod_ordercondition.class.php
===================================================================
--- /mods/wpsg_mod_ordercondition.class.php (revision 5371)
+++ /mods/wpsg_mod_ordercondition.class.php (revision 5382)
@@ -27,5 +27,5 @@
} // public function __construct()
-
+
public function install()
{
Index: /mods/wpsg_mod_ordervars.class.php
===================================================================
--- /mods/wpsg_mod_ordervars.class.php (revision 5371)
+++ /mods/wpsg_mod_ordervars.class.php (revision 5382)
@@ -32,5 +32,5 @@
} // public function __construct()
-
+
public function install()
{
@@ -45,4 +45,5 @@
pflicht INT(1) NOT NULL,
deleted INT(1) NOT NULL,
+ pos int(11) NOT NULL,
PRIMARY KEY (id)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
@@ -85,4 +86,21 @@
}
+ else if ($_REQUEST['do'] == 'reorder')
+ {
+
+ parse_str($_REQUEST['wpsg_reorder'], $wpsg_reorder);
+
+ foreach ($wpsg_reorder['ov'] as $pos => $ov_id)
+ {
+
+ $this->db->UpdateQuery(WPSG_TBL_ORDERVARS, array(
+ 'pos' => wpsg_q($pos)
+ ), " `id` = '".wpsg_q($ov_id)."' ");
+
+ }
+
+ die("1");
+
+ }
else if ($_REQUEST['do'] == 'del')
{
@@ -134,5 +152,5 @@
// VerfÃŒgbare Bestellvariablen
- $arOV = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1'");
+ $arOV = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `pos` ASC, `id` ASC ");
foreach ($arOV as $ov)
@@ -240,5 +258,5 @@
{
- $arOV_db = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` ");
+ $arOV_db = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `pos` ASC, `id` ASC ");
$arOV = array();
@@ -283,5 +301,5 @@
{
- $this->shop->view['wpsg_mod_ordervars']['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1'");
+ $this->shop->view['wpsg_mod_ordervars']['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `pos` ASC, `id` ASC ");
if (!wpsg_isSizedArray($this->shop->view['wpsg_mod_ordervars']['data'])) return;
@@ -367,5 +385,7 @@
`".WPSG_TBL_ORDERVARS."` AS OV
WHERE
- `deleted` != '1'
+ `deleted` != '1'
+ ORDER BY
+ `pos` ASC, `id` ASC
");
@@ -391,5 +411,5 @@
{
- $arOV = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1'");
+ $arOV = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_ORDERVARS."` WHERE `deleted` != '1' ORDER BY `pos` ASC, `id` ASC ");
if (!wpsg_isSizedArray($arOV)) return false;
@@ -479,5 +499,5 @@
{
- $this->shop->view['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` ORDER BY `id` ASC");
+ $this->shop->view['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERVARS."` ORDER BY `pos` ASC, `id` ASC ");
$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_ordervars/ov_list.phtml');
Index: /mods/wpsg_mod_paypal.class.php
===================================================================
--- /mods/wpsg_mod_paypal.class.php (revision 5371)
+++ /mods/wpsg_mod_paypal.class.php (revision 5382)
@@ -202,5 +202,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
@@ -634,5 +634,5 @@
$this->shop->addFrontendError(__('PayPal Fehler, bitte Shop Betreiber kontaktieren.', 'wpsg'));
- $this->shop->redirect($this->shop->getDoneURL($oOrder->id));
+ $this->shop->redirect(get_permalink($this->shop->get_option('wpsg_page_mod_paypal_error')));
}
Index: /mods/wpsg_mod_paypalapi.class.php
===================================================================
--- /mods/wpsg_mod_paypalapi.class.php (revision 5371)
+++ /mods/wpsg_mod_paypalapi.class.php (revision 5382)
@@ -93,4 +93,5 @@
$this->shop->update_option('wpsg_mod_paypalapi_plus_hint', $_REQUEST['wpsg_mod_paypalapi_plus_hint'], false, true);
$this->shop->update_option('wpsg_mod_paypalapi_paypalexpress_subject', $_REQUEST['wpsg_mod_paypalapi_paypalexpress_subject']);
+ $this->shop->update_option('wpsg_mod_paypalapi_paypalexpress_forceSSL', $_REQUEST['wpsg_mod_paypalapi_paypalexpress_forceSSL']);
$this->shop->update_option('wpsg_mod_paypalapi_paypalexpress_details', $_REQUEST['wpsg_mod_paypalapi_paypalexpress_details']);
@@ -186,5 +187,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
@@ -263,4 +264,9 @@
{
+ // Wenn 0,- dann nix machen
+ $arBasket = $this->shop->basket->toArray();
+ if ($arBasket['sum']['preis_gesamt_brutto'] <= 0) return false;
+
+ // Wenn PayPal nicht drin ist, dann nichts machen
if (!array_key_exists($this->id, $this->shop->arPayment)) return false;
@@ -361,5 +367,5 @@
{
- $this->shop->view['wpsg_mod_paypalapi']['error'] = __('Sie hatten bereits eine Zahlungsart gewÀhlt. Aufgrund technischer EinschrÀnkungen muss diese Auswahl hier erneut durchgefÌhrt werden.', 'wpsg');
+ $this->shop->view['wpsg_mod_paypalapi']['error'] = __('Sie hatten eventuelle bereits eine Zahlungsart gewÀhlt. Aufgrund technischer EinschrÀnkungen kann es sein dass diese Auswahl hier erneut durchgefÌhrt werden muss.', 'wpsg');
}
@@ -435,9 +441,9 @@
$payment_info = $this->api_getPaymentInfo($oOrder->getMeta('wpsg_mod_paypalapi_paymentId'), true);
-
+
$amount_approved = floatval($payment_info['transactions'][0]['amount']['total']);
//if ($amount_approved === floatval($oOrder->getAmount()) && !wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid')))
- if ($amount_approved === floatval($oOrder->getAmount()) && !wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid')) && wpsg_isSizedString($payment_info['payer']['status'], 'VERIFIED'))
+ if (in_array($payment_info['state'], array('approved', 'created')) && $amount_approved === floatval($oOrder->getAmount()) && !wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid')))
{
@@ -510,4 +516,8 @@
{
+ // Bestellungen mit 0,- mÃŒssen nicht bearbeitet werden
+ if ($basket_view['basket']['sum']['preis_gesamt_brutto'] <= 0) return;
+
+ // PayPal oder PayPal Express ist deaktiviert
if (!wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_aktiv')) || !wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress'))) return false;
@@ -708,14 +718,52 @@
$_SESSION['wpsg']['checkout']['payment'] = $this->id;
- $_SESSION['wpsg']['checkout']['vname'] = $json_data['payer']['payer_info']['first_name'];
- $_SESSION['wpsg']['checkout']['name'] = $json_data['payer']['payer_info']['last_name'];
- $_SESSION['wpsg']['checkout']['email'] = $json_data['payer']['payer_info']['email'];
- $_SESSION['wpsg']['checkout']['email2'] = $json_data['payer']['payer_info']['email'];
- $_SESSION['wpsg']['checkout']['tel'] = $json_data['payer']['payer_info']['phone'];
- $_SESSION['wpsg']['checkout']['strasse'] = $json_data['payer']['payer_info']['shipping_address']['line1'];
- $_SESSION['wpsg']['checkout']['ort'] = $json_data['payer']['payer_info']['shipping_address']['city'];
- $_SESSION['wpsg']['checkout']['plz'] = $json_data['payer']['payer_info']['shipping_address']['postal_code'];
- $_SESSION['wpsg']['checkout']['land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper($json_data['payer']['payer_info']['shipping_address']['country_code']))."'");
- $_SESSION['wpsg']['checkout']['payment_amount'] = $json_data['transactions'][0]['amount']['total'];
+
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['vname'])) $_SESSION['wpsg']['checkout']['vname'] = $json_data['payer']['payer_info']['first_name'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['name'])) $_SESSION['wpsg']['checkout']['name'] = $json_data['payer']['payer_info']['last_name'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['email']))
+ {
+ $_SESSION['wpsg']['checkout']['email'] = $json_data['payer']['payer_info']['email'];
+ $_SESSION['wpsg']['checkout']['email2'] = $json_data['payer']['payer_info']['email'];
+ }
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['tel'])) $_SESSION['wpsg']['checkout']['tel'] = $json_data['payer']['payer_info']['phone'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['strasse'])) $_SESSION['wpsg']['checkout']['strasse'] = $json_data['payer']['payer_info']['billing_address']['line1'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['ort'])) $_SESSION['wpsg']['checkout']['ort'] = $json_data['payer']['payer_info']['billing_address']['city'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['plz'])) $_SESSION['wpsg']['checkout']['plz'] = $json_data['payer']['payer_info']['billing_address']['postal_code'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['land'])) $_SESSION['wpsg']['checkout']['land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper($json_data['payer']['payer_info']['billing_address']['country_code']))."'");
+
+ if (wpsg_isSizedArray(wpsg_trim($json_data['payer']['payer_info']['shipping_address'])) && $this->shop->hasMod('wpsg_mod_shippingadress'))
+ {
+
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['shipping_plz'])) $_SESSION['wpsg']['checkout']['shipping_plz'] = $json_data['payer']['payer_info']['shipping_address']['postal_code'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['shipping_vname']) || !wpsg_isSizedString($_SESSION['wpsg']['checkout']['shipping_name']))
+ {
+
+ $arName = explode(' ', $json_data['payer']['payer_info']['shipping_address']['recipient_name']);
+
+ if (sizeof($arName) > 1) $_SESSION['wpsg']['checkout']['shipping_vname'] = $arName[0]; else $_SESSION['wpsg']['checkout']['shipping_vname'] = '';
+ if (sizeof($arName) > 1) $_SESSION['wpsg']['checkout']['shipping_name'] = implode(' ', array_slice($arName, 1)); else $_SESSION['wpsg']['checkout']['shipping_name'] = implode(' ', $arName);
+
+ }
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['shipping_strasse'])) $_SESSION['wpsg']['checkout']['shipping_strasse'] = $json_data['payer']['payer_info']['shipping_address']['line1'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['shipping_ort'])) $_SESSION['wpsg']['checkout']['shipping_ort'] = $json_data['payer']['payer_info']['shipping_address']['city'];
+ if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['shipping_land'])) $_SESSION['wpsg']['checkout']['shipping_land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper($json_data['payer']['payer_info']['shipping_address']['country_code']))."'");
+
+ $_SESSION['wpsg']['checkout']['diff_shippingadress'] = '1';
+
+ /*
+ [shipping_address] => Array
+ (
+ [recipient_name] => Max Mustermann
+ [line1] => ESpachstr. 1
+ [city] => Freiburg
+ [state] => Empty
+ [postal_code] => 79111
+ [country_code] => DE
+ )
+ */
+
+ }
+
+ $_SESSION['wpsg']['checkout']['payment_amount'] = $json_data['transactions'][0]['amount']['total'];
$_SESSION['wpsg']['checkout']['paymentId'] = $_REQUEST['paymentId'];
$_SESSION['wpsg']['checkout']['payer_id'] = $json_data['payer']['payer_info']['payer_id'];
Index: /mods/wpsg_mod_prepayment.class.php
===================================================================
--- /mods/wpsg_mod_prepayment.class.php (revision 5371)
+++ /mods/wpsg_mod_prepayment.class.php (revision 5382)
@@ -110,5 +110,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_productgroups.class.php
===================================================================
--- /mods/wpsg_mod_productgroups.class.php (revision 5371)
+++ /mods/wpsg_mod_productgroups.class.php (revision 5382)
@@ -25,5 +25,5 @@
} // public function __construct()
-
+
public function install()
{
Index: /mods/wpsg_mod_productindex.class.php
===================================================================
--- /mods/wpsg_mod_productindex.class.php (revision 5371)
+++ /mods/wpsg_mod_productindex.class.php (revision 5382)
@@ -293,9 +293,10 @@
if (!isset($filter['page']) || $filter['page'] > $filter['pages'] || $filter['page'] <= 0) $filter['page'] = 1;
+ // Sortieren
+ uasort($arProducts, array($this, 'order'));
+
// Seite selektieren
$arProducts = array_slice($arProducts, ($filter['page'] - 1) * $filter['perPage'], $filter['perPage']);
- uasort($arProducts, array($this, 'order'));
-
$this->shop->view['wpsg_mod_productindex']['filter'] = $filter;
Index: /mods/wpsg_mod_productvars.class.php
===================================================================
--- /mods/wpsg_mod_productvars.class.php (revision 5371)
+++ /mods/wpsg_mod_productvars.class.php (revision 5382)
@@ -12,5 +12,5 @@
var $id = 950;
var $hilfeURL = 'http://wpshopgermany.de/?p=815';
- var $inline = true;
+ var $inline = false;
/**
@@ -33,5 +33,5 @@
} // public function __construct()
-
+
public function install()
{
@@ -64,4 +64,11 @@
} // public function settings_edit()
+ public function settings_save()
+ {
+
+ $this->shop->update_option('wpsg_mod_productvars_showProduct', $_REQUEST['wpsg_mod_productvars_showProduct']);
+
+ }
+
public function be_ajax()
{
@@ -462,6 +469,6 @@
{
- //$this->shop->addFrontendError(wpsg_translate(__('Bitte im Feld "#1#" eine Auswahl treffen!', 'wpsg'), __($pv_db['name'], 'wpsg')));
- //$_SESSION['wpsg']['errorFields'][] = 'wpsg_mod_productvars_'.$pv_id.'_'.$ses_data['id'];
+ $this->shop->addFrontendError(wpsg_translate(__('Bitte im Feld "#1#" eine Auswahl treffen!', 'wpsg'), __($pv_db['name'], 'wpsg')));
+ $_SESSION['wpsg']['errorFields'][] = 'wpsg_mod_productvars_'.$pv_id.'_'.$ses_data['id'];
$bError = true;
@@ -470,6 +477,6 @@
{
- //$this->shop->addFrontendError(wpsg_translate(__('Bitte im Feld "#1#" eine Angabe machen!', 'wpsg'), __($pv_db['name'], 'wpsg')));
- //$_SESSION['wpsg']['errorFields'][] = 'wpsg_mod_productvars_'.$pv_id.'_'.$ses_data['id'];
+ $this->shop->addFrontendError(wpsg_translate(__('Bitte im Feld "#1#" eine Angabe machen!', 'wpsg'), __($pv_db['name'], 'wpsg')));
+ $_SESSION['wpsg']['errorFields'][] = 'wpsg_mod_productvars_'.$pv_id.'_'.$ses_data['id'];
$bError = true;
@@ -478,6 +485,6 @@
{
- //$this->shop->addFrontendError(wpsg_translate(__('Bitte das Feld "#1#" aktivieren!', 'wpsg'), __($pv_db['name'], 'wpsg')));
- //$_SESSION['wpsg']['errorFields'][] = 'wpsg_mod_productvars_'.$pv_id.'_'.$ses_data['id'];
+ $this->shop->addFrontendError(wpsg_translate(__('Bitte das Feld "#1#" aktivieren!', 'wpsg'), __($pv_db['name'], 'wpsg')));
+ $_SESSION['wpsg']['errorFields'][] = 'wpsg_mod_productvars_'.$pv_id.'_'.$ses_data['id'];
$bError = true;
@@ -490,5 +497,5 @@
// Nix machen bei Warenkorbaktualisierung
if (isset($_REQUEST['wpsg_basket_refresh'])) return;
-
+
if ($bError === true) return -2; else return true;
@@ -538,7 +545,10 @@
}
-
- return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvars/renderTemplate.phtml', false);
-
+
+ if ($this->shop->get_option('wpsg_mod_productvars_showProduct') == '1')
+ echo $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvars/renderTemplate.phtml', false);
+ else
+ return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvars/renderTemplate.phtml', false);
+
}
Index: /mods/wpsg_mod_productview.class.php
===================================================================
--- /mods/wpsg_mod_productview.class.php (revision 5382)
+++ /mods/wpsg_mod_productview.class.php (revision 5382)
@@ -0,0 +1,34 @@
+name = __('Produktansichten', 'wpsg');
+ $this->group = __('Produkte', 'wpsg');
+ $this->desc = __('Ermöglicht die Darstellung von Produktlisten Ìber Shortcodes.', 'wpsg');
+
+ } // public function __construct()
+
+ public function init()
+ {
+
+
+ } // public function init()
+
+
+
+ } // class wpsg_mod_productview extends wpsg_mod_basic
+
+?>
Index: /mods/wpsg_mod_produktartikel.class.php
===================================================================
--- /mods/wpsg_mod_produktartikel.class.php (revision 5371)
+++ /mods/wpsg_mod_produktartikel.class.php (revision 5382)
@@ -45,10 +45,10 @@
{
- wp_enqueue_script('wpsg_mod_produktartikel_social', WPSG_URL_CONTENT.'plugins/wpshopgermany/lib/socialshareprivacy/jquery.socialshareprivacy.js');
+ wp_enqueue_script('wpsg_mod_produktartikel_social', WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/socialshareprivacy/jquery.socialshareprivacy.js');
}
} // public function wpsg_enqueue_scripts()
-
+
public function install()
{
@@ -540,5 +540,5 @@
array(
'public' => true, // steht auf "true", damit andere Module/ Plugins diesen Posttype "sehen" können
- 'publicly_queryable' => false,
+ 'publicly_queryable' => true,
'labels' => array(
'name' => __('wpShopGermany Produkte', 'wpsg')
@@ -549,4 +549,5 @@
'show_in_menu' => true,
'taxonomies' => array('category'),
+ 'has_archive' => true,
'supports' => array('title', 'editor', 'thumbnail')
)
@@ -648,5 +649,7 @@
");
- if (wpsg_isSizedInt($post_id) && wpsg_isSizedString(get_permalink($post_id)))
+ $permalink = get_permalink($post_id);
+
+ if (wpsg_isSizedInt($post_id) && wpsg_isSizedString($permalink))
{
Index: /mods/wpsg_mod_produktattribute.class.php
===================================================================
--- /mods/wpsg_mod_produktattribute.class.php (revision 5371)
+++ /mods/wpsg_mod_produktattribute.class.php (revision 5382)
@@ -26,5 +26,5 @@
} // public function __construct()
-
+
public function install()
{
@@ -41,4 +41,5 @@
auswahl varchar(1000) NOT NULL,
autoshow int(1) NOT NULL,
+ pos int(11) NOT NULL,
PRIMARY KEY (id)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
@@ -79,4 +80,21 @@
}
+ else if ($_REQUEST['do'] == 'reorder')
+ {
+
+ parse_str($_REQUEST['wpsg_reorder'], $wpsg_reorder);
+
+ foreach ((array)$wpsg_reorder['pa'] as $pos => $pa_id)
+ {
+
+ $this->db->UpdateQuery(WPSG_TBL_AT, array(
+ 'pos' => wpsg_q($pos)
+ ), " `id` = '".wpsg_q($pa_id)."' ");
+
+ }
+
+ die("1");
+
+ }
else if ($_REQUEST['do'] == 'genPACode')
{
@@ -177,5 +195,5 @@
");
- $pa = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_AT."` WHERE `id` = '".wpsg_q($pa_id)."'");
+ $pa = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_AT."` WHERE `id` = '".wpsg_q($pa_id)."' ORDER BY `pos` ASC, `id` ASC ");
if ($pa['typ'] == 1 && $this->shop->get_option('wpsg_options_nl2br') == '1') $pa_value = nl2br($pa_value);
@@ -235,5 +253,5 @@
} // public function produkt_copy(&$produkt_id, &$copy_id)
-
+
public function produkt_edit_content(&$produkt_data)
{
@@ -243,11 +261,5 @@
$this->shop->view['data'] = $produkt_data;
- $this->shop->view['data']['pa'] = $this->db->fetchAssoc("
- SELECT
- A.`id`, A.`name`, A.`typ`, PA.`value`, A.`auswahl`
- FROM
- `".WPSG_TBL_AT."` AS A
- LEFT JOIN `".WPSG_TBL_PRODUCTS_AT."` AS PA ON (PA.`a_id` = A.`id` AND PA.`p_id` = '".wpsg_q($produkt_data['id'])."')
- ");
+ $this->shop->view['data']['pa'] = $this->shop->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->shop->getProduktID($produkt_data['id'])));
$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktattribute/produkt_edit_content.phtml');
@@ -280,4 +292,6 @@
WHERE
PAT.`p_id` = '".wpsg_q($p_id)."'
+ ORDER BY
+ AT.`pos` ASC, AT.`id` ASC
");
@@ -301,4 +315,6 @@
WHERE
AT.`autoshow` = '1'
+ ORDER BY
+ AT.`pos` ASC, AT.`id` ASC
");
@@ -320,4 +336,6 @@
WHERE
AT.`autoshow` = '1'
+ ORDER BY
+ AT.`pos` ASC, AT.`id` ASC
");
@@ -334,9 +352,11 @@
$this->shop->view['wpsg_mod_produktattribute']['data'] = $this->db->fetchAssocField("
SELECT
- AT.`id`
+ `id`
FROM
- `".WPSG_TBL_AT."` AS AT
+ `".WPSG_TBL_AT."`
WHERE
- AT.`autoshow` = '1'
+ `autoshow` = '1'
+ ORDER BY
+ `pos` ASC, `id` ASC
");
@@ -365,5 +385,5 @@
{
- $arAttribute = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_AT."`");
+ $arAttribute = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_AT."` ORDER BY `pos` ASC, `id` ASC ");
foreach ((array)$arAttribute as $pa_id)
@@ -386,5 +406,5 @@
{
- $arAttribute = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_AT."`");
+ $arAttribute = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_AT."` ORDER BY `pos` ASC, `id` ASC ");
foreach ((array)$arAttribute as $pa_id)
@@ -398,4 +418,21 @@
} // public function notifyURL(&$url, &$produkt_key, &$menge, &$order_id, &$typ, &$arSend)
+
+ /* Modulfunktionen */
+
+ public function getProductAttributeByProductId($product_id)
+ {
+
+ return $this->db->fetchAssoc("
+ SELECT
+ A.`id`, A.`name`, A.`typ`, PA.`value`, A.`auswahl`
+ FROM
+ `".WPSG_TBL_AT."` AS A
+ LEFT JOIN `".WPSG_TBL_PRODUCTS_AT."` AS PA ON (PA.`a_id` = A.`id` AND PA.`p_id` = '".wpsg_q($product_id)."')
+ ORDER BY
+ A.`pos` ASC, A.`id` ASC
+ ");
+
+ } // public function getProductAttributeByProductId($product_id)
/**
@@ -435,4 +472,6 @@
PA.`a_id` = '".wpsg_q($pa_id)."' AND
PA.`p_id` = '".wpsg_q($p_id)."'
+ ORDER BY
+ A.`pos` ASC, A.`id` ASC
");
@@ -473,6 +512,6 @@
$this->shop->view['data'] = $this->db->fetchAssoc("
- SELECT * FROM `".WPSG_TBL_AT."` ORDER BY `id` ASC
- ");
+ SELECT * FROM `".WPSG_TBL_AT."` ORDER BY `pos` ASC, `id` ASC
+ ");
$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktattribute/list.phtml');
Index: /mods/wpsg_mod_produktbilder.class.php
===================================================================
--- /mods/wpsg_mod_produktbilder.class.php (revision 5371)
+++ /mods/wpsg_mod_produktbilder.class.php (revision 5382)
@@ -200,4 +200,12 @@
} // public function produkt_save(&$produkt_id)
+ public function produkt_del($product_id)
+ {
+
+ $path_bilder = $this->getPicPath($product_id);
+ wpsg_rrmdir($path_bilder);
+
+ } // public function produkt_del(&$product_id)
+
public function produkt_edit_content(&$produkt_data)
{
@@ -395,6 +403,4 @@
/**
- * VERALTET! Erstellt das Thumbnail zu dem Bild $file aus dem Produkt $p_id
- *
* @param int $p_id Id des Produktes
* @param String $file Dateiname des Bildes (Ohne Pfad)
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php (revision 5371)
+++ /mods/wpsg_mod_rechnungen.class.php (revision 5382)
@@ -50,5 +50,5 @@
} // public function __construct()
-
+
public function install()
{
@@ -476,7 +476,7 @@
*/
- include WPSG_PATH_LIB.'fpdf/fpdf.php';
- include WPSG_PATH_LIB.'fpdf/fpdi.php';
- include WPSG_PATH_MOD.'/mod_rechnungen/wpsg_fpdf.class.php';
+ require_once WPSG_PATH_LIB.'fpdf/fpdf.php';
+ require_once WPSG_PATH_LIB.'fpdf/fpdi.php';
+ require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';
$pdf = new wpsg_fpdf();
Index: /mods/wpsg_mod_relatedproducts.class.php
===================================================================
--- /mods/wpsg_mod_relatedproducts.class.php (revision 5371)
+++ /mods/wpsg_mod_relatedproducts.class.php (revision 5382)
@@ -75,4 +75,7 @@
$this->shop->update_option('wpsg_mod_relatedproducts_showBasketLimit', $_REQUEST['wpsg_mod_relatedproducts_showBasketLimit']);
$this->shop->update_option('wpsg_mod_relatedproducts_showBasketTemplate', $_REQUEST['wpsg_mod_relatedproducts_showBasketTemplate']);
+ $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialog', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialog']);
+ $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialogLimit', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialogLimit']);
+ $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialogTemplate']);
} // public function settings_save
@@ -322,5 +325,5 @@
}
- } // public function getRelatedProducts($produkt_id)
+ } // public function getRelatedProducts($produkt_id)
} // class wpsg_mod_relatedproducts extends wpsg_mod_basic
Index: /mods/wpsg_mod_request.class.php
===================================================================
--- /mods/wpsg_mod_request.class.php (revision 5371)
+++ /mods/wpsg_mod_request.class.php (revision 5382)
@@ -271,4 +271,12 @@
if ($this->shop->hasMod('wpsg_mod_ordervars') && wpsg_isSizedInt($this->shop->get_option('wpsg_mod_request_ordervars'))) $this->shop->view['orderVars'] = $this->shop->callMod('wpsg_mod_ordervars', 'getOrderVars');
+
+ if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_request']['error']))
+ {
+
+ $this->shop->view['error'] = $_SESSION['wpsg']['wpsg_mod_request']['error'];
+ unset($_SESSION['wpsg']['wpsg_mod_request']['error']);
+
+ }
$content = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_request/requestpage.phtml', false);
@@ -347,4 +355,18 @@
'ov' => array()
);
+
+ if ($this->shop->hasMod('wpsg_mod_kundenverwaltung'))
+ {
+
+ $customer_login_id = $this->shop->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn');
+
+ if (wpsg_isSizedInt($customer_login_id))
+ {
+
+ $arReturn['customer'] = $_SESSION['wpsg']['checkout'];
+
+ }
+
+ }
foreach ((array)$_SESSION['wpsg']['wpsg_mod_request']['products'] as $ses_key => $ses_product)
@@ -479,4 +501,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'email';
$this->shop->addFrontendError(__('Bitte ÌberprÌfen Sie die Eingaben in der E-Mail BestÀtigung!', 'wpsg'));
$bOK = false;
@@ -495,9 +518,11 @@
$bOK = false;
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = $k;
+
switch ($k)
{
case 'firma'; $this->shop->addFrontendError(__('Bitte im Feld "Firma" eine Angabe machen!'. 'wpsg')); break;
- case 'vname': $this->shop->addFrontendError(__('Bitte im Feld "Vorname" eine Angabe machen!', 'wpsg')); break;
+ case 'vname': $this->shop->addFrontendError(__('Bitte im Feld "Vorname" eine Angabe machen!', 'wpsg')); break;
case 'name': $this->shop->addFrontendError(__('Bitte im Feld "Name" eine Angabe machen!', 'wpsg')); break;
case 'fax': $this->shop->addFrontendError(__('Bitte die Eingaben im Feld "Fax" ÃŒberprÃŒfen!', 'wpsg')); break;
@@ -514,16 +539,25 @@
}
//else if (array_key_exists($k, $required_fields) && $required_fields[$k] != 1 && $k === "geb" && !wspg_isValidGeb($v))
- if (
- (wspg_isValidGeb($v) && wpsg_isSizedString($v)) ||
- !array_key_exists($k, $required_fields)
- )
- {
-
+ else if ($k === "geb" &&
+ (
+ ($required_fields[$k] != '1' && !wspg_isValidGeb($v)) ||
+ (wpsg_isSizedString($v) && !wspg_isValidGeb($v))
+ )
+ )
+ {
+
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'geb';
$bOK = false; $this->shop->addFrontendError(__('Bitte die Eingabe im Feld "Geburtsdatum" ÃŒberprÃŒfen!', 'wpsg'));
}
- else if (array_key_exists($k, $required_fields) && $required_fields[$k] != 1 && $k === "email" && !wpsg_isValidEMail($v))
- {
-
+ else if ($k == 'email' &&
+ (
+ ($required_fields[$k] != '1' && !wpsg_isValidEMail($v)) ||
+ (wpsg_isSizedString($v) && !wpsg_isValidEMail($v))
+ )
+ )
+ {
+
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'email';
$bOK = false; $this->shop->addFrontendError(__('Bitte die Eingabe der E-Mail Adresse ÃŒberprÃŒfen!', 'wspg'));
@@ -532,4 +566,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'land';
$bOK = false; $this->shop->addFrontendError(__('Bitte ein Land auswÀhlen!', 'wpsg'));
@@ -538,4 +573,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'title';
$bOK = false; $this->shop->addFrontendError('Bitte im Feld "Anrede" eine Angabe machen!', 'wpsg');
@@ -558,4 +594,5 @@
// Textfeld ist leer
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'custom_'.$custom_key;
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte machen Sie in Feld "#1#" eine Angabe!', 'wpsg'), __($required_fields['custom'][$custom_key]['name'], 'wpsg')));
@@ -570,4 +607,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'custom_'.$custom_key;
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte eine Auswahl im Feld "#1#" treffen!', 'wpsg'), __($required_fields['custom'][$custom_key]['name'], 'wpsg')));
@@ -579,4 +617,5 @@
// Checkbox nicht aktiv
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'custom_'.$custom_key;
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte "#1#" akzeptieren!', 'wpsg'), __($required_fields['custom'][$custom_key]['name'], 'wpsg')));
@@ -614,4 +653,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'ov_'.$ov_id;
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte eine Auswahl im Feld "#1#" treffen!', 'wpsg'), $ov_db[$ov_id]['name']));
@@ -622,4 +662,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'ov_'.$ov_id;
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte machen Sie in Feld "#1#" eine Angabe!', 'wpsg'), $ov_db[$ov_id]['name']));
@@ -628,4 +669,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'ov_'.$ov_id;
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte "#1#" akzeptieren!', 'wpsg'), $ov_db[$ov_id]['name']));
@@ -659,4 +701,5 @@
{
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'pv_'.$pv['id'];
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte eine Auswahl im Feld "#1#" in Produkt "#2#" treffen!', 'wpsg'), $pv['name'], $request_product['product_data']['name']));
@@ -668,4 +711,5 @@
// Kein Text
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'pv_'.$pv['id'];
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte machen Sie eine Angabe im Feld "#1#" in Produkt "#2#"!', 'wpsg'), $pv['name'], $request_product['product_data']['name']));
@@ -675,4 +719,5 @@
// Checkbox nicht aktiviert
+ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'pv_'.$pv['id'];
$bOK = false; $this->shop->addFrontendError(wpsg_translate(__('Bitte akzeptieren Sie "#1#" in Produkt "#2#"!', 'wpsg'), $pv['name'], $request_product['product_data']['name']));
Index: /mods/wpsg_mod_shs.class.php
===================================================================
--- /mods/wpsg_mod_shs.class.php (revision 5371)
+++ /mods/wpsg_mod_shs.class.php (revision 5382)
@@ -210,5 +210,5 @@
}
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_skrill.class.php
===================================================================
--- /mods/wpsg_mod_skrill.class.php (revision 5371)
+++ /mods/wpsg_mod_skrill.class.php (revision 5382)
@@ -117,9 +117,9 @@
'mwst_value' => $mwst_value,
'mwst_null' => $this->shop->get_option('wpsg_mod_skrill_mwstland'),
- 'logo' => WPSG_URL_CONTENT.'plugins/wpshopgermany/views/gfx/skrill.png',
+ 'logo' => WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/views/gfx/skrill.png',
'logo_100x25' => $this->shop->getRessourceURL('mods/mod_skrill/gfx/logo_100x25.png')
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_statistics.class.php
===================================================================
--- /mods/wpsg_mod_statistics.class.php (revision 5371)
+++ /mods/wpsg_mod_statistics.class.php (revision 5382)
@@ -515,5 +515,5 @@
foreach ($this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]['js'] as $index => $value)
{
- wp_enqueue_script($index, WPSG_URL_CONTENT.'plugins/wpshopgermany/'.$value);
+ wp_enqueue_script($index, WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/'.$value);
}
}
@@ -523,5 +523,5 @@
foreach ($this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]['css'] as $index => $value)
{
- wp_enqueue_style($index, WPSG_URL_CONTENT.'plugins/wpshopgermany/'.$value);
+ wp_enqueue_style($index, WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/'.$value);
}
}
@@ -580,5 +580,5 @@
if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'wpsg-Statistics')
{
- wp_enqueue_style('wpsg_mod_statistics_css_jqplot', WPSG_URL_CONTENT.'plugins/wpshopgermany/lib/jqplot/jquery.jqplot.css');
+ wp_enqueue_style('wpsg_mod_statistics_css_jqplot', WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/jqplot/jquery.jqplot.css');
}
Index: /mods/wpsg_mod_stock.class.php
===================================================================
--- /mods/wpsg_mod_stock.class.php (revision 5371)
+++ /mods/wpsg_mod_stock.class.php (revision 5382)
@@ -364,4 +364,38 @@
}
+ public function checkCheckout(&$state, &$error, &$arCheckout)
+ {
+
+ if (!wpsg_isSizedInt($this->shop->get_option('wpsg_mod_stock_allow')) || $state !== true) return;
+
+ foreach ((array)$this->shop->basket->arProdukte as $product_data)
+ {
+
+ if (!$this->checkBestand($product_data['id'], $product_data['menge']))
+ {
+
+ $nStockAvailable = $this->getBestand($product_data['id']);
+
+ if ($nStockAvailable <= 0)
+ {
+
+ $this->shop->addFrontendError(
+ wpsg_translate(
+ __('Der Lagerbestand von Produkt "#1#" hat sich zwischenzeitlich verÀndert. Es sind nur noch #1# StÌck verfÌgbar.', 'wpsg'),
+ $this->shop->getProductName($product_data['id']),
+ $nStockAvailable
+ )
+ );
+
+ $error = true;
+
+ }
+
+ }
+
+ }
+
+ } // public function checkCheckout(&$state, &$error, &$arCheckout)
+
/* Modulfunktionen */
@@ -519,4 +553,6 @@
public function basket_save_product(&$data, &$product_data_db, $finish_order)
{
+
+ return;
if ($finish_order !== true) return;
@@ -562,4 +598,73 @@
} // public function basket_save_product(&$data, &$product_data)
+ /* Modulfunktionen */
+
+ public function checkReduceStock(&$data, &$product_data)
+ {
+
+ $product_id = $this->shop->getProduktID($data['productkey']);
+
+ // Tabellen sperren
+ if ($this->shop->get_option('wpsg_lockOrderTables') != '1')
+ {
+
+ $arLockTables[WPSG_TBL_PRODUCTS] = "WRITE";
+ if ($this->shop->hasMod('wpsg_mod_productgroups')) $arLockTables[WPSG_TBL_PRODUCTS_GROUP] = "WRITE";
+
+ $strQuery = "LOCK TABLES ";
+ foreach ($arLockTables as $table_name => $locktype) $strQuery .= " `".$table_name."` ".$locktype.",";
+ $this->db->Query(substr($strQuery, 0, -1));
+
+ }
+
+ //sleep(20);
+
+ $product_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($product_id)."' ");
+ $stock = $data['menge'];
+
+ // Fehlerbehandlung fÃŒr Produktbestand
+ if ($product_data['stock_count'] == '1' && $stock > $product_data['stock']) return false;
+
+ if ($this->shop->hasMod('wpsg_mod_productgroups'))
+ {
+
+ $pgroup = $this->db->fetchRow("SELECT `stock_aktiv`, `stock_value` FROM `".WPSG_TBL_PRODUCTS_GROUP."` WHERE `id` = '".wpsg_q($product_data['pgruppe'])."' ");
+
+ if ($pgroup['stock_aktiv'] == '1')
+ {
+
+ if ($pgroup['stock_aktiv'] == '1' && $stock > $pgroup['stock_value']) return false;
+
+ $this->db->Query("
+ UPDATE `".WPSG_TBL_PRODUCTS_GROUP."` SET `stock_value` = `stock_value` - '".wpsg_q($stock)."' WHERE `id` = '".wpsg_q($product_data['pgruppe'])."'
+ ");
+ }
+
+ }
+
+ // Lagerbestand im Produkt zÀhlen?
+ if ($product_data['stock_count'] == '1')
+ {
+
+ if ($this->shop->hasMod('wpsg_mod_varianten') && preg_match('/^vp_(.*)/', $data['productkey']))
+ {
+
+ // Bestand der Variationen runterzÀhlen
+ $this->shop->callMod('wpsg_mod_varianten', 'reduceStock', array($data['productkey'], $stock));
+
+ }
+
+ // Im Produkt selbst runterzÀhlen
+ $this->db->Query("UPDATE `".WPSG_TBL_PRODUCTS."` SET `stock` = `stock` - '".wpsg_q($stock)."' WHERE `id` = '".wpsg_q($product_id)."' ");
+
+ }
+
+ // Tabellen entsperren
+ $this->db->Query("UNLOCK TABLES");
+
+ return true;
+
+ } // public function checkReduceStock(&$data, &$product_data)
+
} // class wpsg_mod_stock extends wpsg_mod_basic
Index: /mods/wpsg_mod_su.class.php
===================================================================
--- /mods/wpsg_mod_su.class.php (revision 5371)
+++ /mods/wpsg_mod_su.class.php (revision 5382)
@@ -151,5 +151,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_test.class.php
===================================================================
--- /mods/wpsg_mod_test.class.php (revision 5371)
+++ /mods/wpsg_mod_test.class.php (revision 5382)
@@ -115,4 +115,12 @@
));
+ $this->db->ImportQuery(WPSG_TBL_PRODUCTS, array(
+ 'id' => '8',
+ 'cdate' => 'NOW()',
+ 'name' => 'Produkt 19%',
+ 'preis' => '20.08',
+ 'mwst_key' => 'c'
+ ));
+
$this->db->ImportQuery(WPSG_TBL_VA, array(
'id' => '1',
@@ -162,5 +170,5 @@
$this->shop->wp_load();
-
+
if ($this->shop->hasMod('wpsg_mod_gutschein'))
{
@@ -211,6 +219,7 @@
$this->test16();
$this->test17();
- $this->test18();
-
+ $this->test18();
+ $this->test19();
+
$this->restoreConfig();
@@ -329,4 +338,49 @@
} // public function restoreConfig()
+
+ /*
+ * http://forum.maennchen1.de/viewtopic.php?f=13&t=6834&start=30
+ * 20,08 Brutto
+ * - Frontend Netto
+ * - 7 im Warenkorb
+ */
+ private function test19()
+ {
+
+ $this->resetConfig();
+
+ $this->shop->update_option('wpsg_preisangaben', WPSG_BRUTTO);
+ $this->shop->update_option('wpsg_preisangaben_frontend', WPSG_BRUTTO);
+
+ $_SESSION['wpsg']['basket'] = array(
+ 0 => array(
+ 'menge' => 7,
+ 'id' => 8
+ )
+ );
+
+ $basket = new wpsg_basket();
+ $basket->initFromSession();
+
+ $this->shop->view['test'][] = array(
+ 'label' => '1 Produkte (20,08Brutto * 7)',
+ 'tests' => array(
+ 'sum/mwst' => array(false, 22.44),
+ 'sum/preis_netto' => array(false, 118.12),
+ 'sum/preis_brutto' => array(false, 140.56),
+ /*'sum/preis' => array(false, 140.56),
+ 'sum/preis_gesamt_netto' => array(false, 200),
+ 'sum/preis_gesamt_brutto' => array(false, 226),
+ 'sum/preis_gesamt' => array(false, 226),
+ 'mwst/b_1/base_value' => array(false, 107),
+ 'mwst/b_1/sum' => array(false, 7),
+ 'mwst/c_1/base_value' => array(false, 119),
+ 'mwst/c_1/sum' => array(false, 19),*/
+ ),
+ 'array' => $basket->toArray(),
+ 'config' => $this->showConfiguration()
+ );
+
+ } // private function test19()
/**
@@ -876,10 +930,10 @@
'tests' => array(
'sum/mwst' => array(false, 77.516806722689),
- 'sum/preis_netto' => array(false, 407.98319327731),
+ 'sum/preis_netto' => array(false, 407.98),
'sum/preis_brutto' => array(false, 485.5),
- 'sum/preis' => array(false, 407.98319327731),
- 'sum/preis_gesamt_netto' => array(false, 407.98319327731),
+ 'sum/preis' => array(false, 407.98),
+ 'sum/preis_gesamt_netto' => array(false, 407.98),
'sum/preis_gesamt_brutto' => array(false, 485.5),
- 'sum/preis_gesamt' => array(false, 407.98319327731),
+ 'sum/preis_gesamt' => array(false, 407.98),
'sum/gs_netto' => array(false, 50),
'sum/gs_brutto' => array(false, 59.5),
Index: /mods/wpsg_mod_userpayment.class.php
===================================================================
--- /mods/wpsg_mod_userpayment.class.php (revision 5371)
+++ /mods/wpsg_mod_userpayment.class.php (revision 5382)
@@ -165,5 +165,5 @@
{
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
@@ -197,5 +197,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /mods/wpsg_mod_versandarten.class.php
===================================================================
--- /mods/wpsg_mod_versandarten.class.php (revision 5371)
+++ /mods/wpsg_mod_versandarten.class.php (revision 5382)
@@ -222,5 +222,5 @@
public function addShipping(&$arShipping)
{
-
+
// Im Checkout2 wird der Wert berechnet und eventuell nicht verfÃŒgbare VA ausgeschlossen
//if (isset($_REQUEST['wpsg_checkout2']))
@@ -238,5 +238,5 @@
$land = $arBasket['checkout']['land'];
}
-
+
$vz = $this->db->fetchOne("SELECT `vz` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($land)."'");
@@ -307,7 +307,7 @@
if ($arBasket['noMwSt'] == '1') $shipping_brutto = $shipping_netto;
-
+
// Entsprechenden Preis anzeigen
- if ($this->shop->getFrontendTaxview() == WPSG_NETTO || $arBasket['noMwst'] == '1')
+ if ($this->shop->getFrontendTaxview() == WPSG_NETTO || @$arBasket['noMwst'] == '1')
{
@@ -325,5 +325,5 @@
}
-
+
} // public function addShipping(&$arShipping)
@@ -368,5 +368,5 @@
$arBasket['shipping']['mwst'] = 0;
- $this->shop->arShipping[$arBasket['checkout']['shipping']]['mwst_value'] = 0;
+ if (array_key_exists($arBasket['checkout']['shipping'], $this->shop->arShipping)) $this->shop->arShipping[$arBasket['checkout']['shipping']]['mwst_value'] = 0;
$arBasket['shipping']['tax_rata'] = false;
@@ -517,9 +517,9 @@
$arPLZ = wpsg_trim(preg_split("/\r|\n/", $this->db->fetchOne("
SELECT
- VZ.`param`
+ `param`
FROM
- `".WPSG_TBL_VZ."` AS VZ
+ `".WPSG_TBL_VZ."`
WHERE
- VZ.`id` = '".wpsg_q($vz_id)."'
+ `id` = '".wpsg_q($vz_id)."'
")));
Index: /mods/wpsg_mod_voucherproduct.class.php
===================================================================
--- /mods/wpsg_mod_voucherproduct.class.php (revision 5371)
+++ /mods/wpsg_mod_voucherproduct.class.php (revision 5382)
@@ -235,5 +235,5 @@
$mail_text = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_voucherproduct/gutschein_mail.phtml', false);
- if ($this->shop->htmlMail === true)
+ if ($this->get_option('wpsg_htmlmail') === '1')
{
@@ -619,7 +619,7 @@
if ($this->shop->isMultiBlog())
{
-
- $path = UPLOADS.'/wpsg/wpsg_mod_gutscheinprodukt/'.$order_id;
- $htaccess = UPLOADS.'/wpsg/wpsg_mod_gutscheinprodukt/.htaccess';
+
+ $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_mod_gutscheinprodukt/'.$order_id.'/';
+ $htaccess = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_mod_gutscheinprodukt/.htaccess';
$strReturn = $path.'/'.$order_id.'/';
Index: /mods/wpsg_mod_weight.class.php
===================================================================
--- /mods/wpsg_mod_weight.class.php (revision 5371)
+++ /mods/wpsg_mod_weight.class.php (revision 5382)
@@ -80,4 +80,5 @@
$this->shop->update_option('wpsg_mod_weight_showProduct', $_REQUEST['wpsg_mod_weight_showProduct']);
$this->shop->update_option('wpsg_mod_weight_showBasket', $_REQUEST['wpsg_mod_weight_showBasket']);
+ $this->shop->update_option('wpsg_mod_weight_showAjaxDialog', $_REQUEST['wpsg_mod_weight_showAjaxDialog']);
$this->shop->update_option('wpsg_mod_weight_showBasketProduct', $_REQUEST['wpsg_mod_weight_showBasketProduct']);
$this->shop->update_option('wpsg_mod_weight_showOverview', $_REQUEST['wpsg_mod_weight_showOverview']);
@@ -212,5 +213,5 @@
} // public function basket_save_order(&$data, &$checkout, &$arBasket, $finish_order)
- public function basket_save_product(&$data, &$product_data)
+ public function basket_save_product(&$data, &$product_data, $finish_order)
{
Index: /mods/wpsg_mod_willcollect.class.php
===================================================================
--- /mods/wpsg_mod_willcollect.class.php (revision 5371)
+++ /mods/wpsg_mod_willcollect.class.php (revision 5382)
@@ -62,4 +62,5 @@
$this->shop->update_option('wpsg_mod_willcollect_hint', $_REQUEST['wpsg_mod_willcollect_hint']);
$this->shop->update_option('wpsg_mod_willcollect_paymentneed', $_REQUEST['wpsg_mod_willcollect_paymentneed']);
+ $this->shop->update_option('wpsg_mod_willcollect_dontMerge', $_REQUEST['wpsg_mod_willcollect_dontMerge']);
$this->shop->update_option('wpsg_mod_willcollect_adress', $_REQUEST['wpsg_mod_willcollect_adress']);
@@ -151,5 +152,5 @@
);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
@@ -295,5 +296,5 @@
$shipping_price = $this->getPreis($this->shop->get_option('wpsg_mod_willcollect_gebuehr'), $arBasket['sum']['preis']);
- if ($va['mwst_akt'] != '1' && $arBasket['noMwSt'])
+ if ($arBasket['noMwSt'])
{
Index: /mods/wpsg_mod_wirecard.class.php
===================================================================
--- /mods/wpsg_mod_wirecard.class.php (revision 5371)
+++ /mods/wpsg_mod_wirecard.class.php (revision 5382)
@@ -183,5 +183,5 @@
$arPayment[$this->id]['hint'] = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_wirecard/paymenthint.phtml', false);
- if (isset($_REQUEST['wpsg_checkout2']))
+ if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
{
Index: /system/parseChangelog.php
===================================================================
--- /system/parseChangelog.php (revision 5371)
+++ /system/parseChangelog.php (revision 5382)
@@ -77,4 +77,5 @@
// Klasse fÃŒr XML-RPC Schnittstelle einbinden und aufrufen
+ require($wp_home.'/wp-load.php');
require($wp_home.'/wp-includes/class-IXR.php');
$rpc = new IXR_Client('http://wpshopgermany.maennchen1.de/xmlrpc.php');
Index: /views/admin/customerpreset.phtml
===================================================================
--- /views/admin/customerpreset.phtml (revision 5371)
+++ /views/admin/customerpreset.phtml (revision 5382)
@@ -25,10 +25,10 @@
|
view['data'] as $pa) { ?>
-
+ |
|
@@ -126,3 +126,38 @@
+
+
+
+
+
+
Index: /views/mods/mod_rechnungen/rechnung_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/rechnung_pdf.phtml (revision 5371)
+++ /views/mods/mod_rechnungen/rechnung_pdf.phtml (revision 5382)
@@ -7,5 +7,5 @@
require_once WPSG_PATH_LIB.'fpdf/fpdf.php';
require_once WPSG_PATH_LIB.'fpdf/fpdi.php';
- require_once WPSG_PATH_MOD.'mod_rechnungen/wpsg_fpdf.class.php';
+ require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';
global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top;
@@ -140,7 +140,7 @@
$pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10));
- $pdf->SetTextColor($text['color']);
- $pdf->MultiCell($text['x'], $text['y'], 5, utf8_encode($text['text']));
- $pdf->SetTextColor("#000000");
+ $pdf->wpsg_SetTextColor($text['color']);
+ $pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']);
+ $pdf->wpsg_SetTextColor("#000000");
}
@@ -152,5 +152,5 @@
}
//wpsg_debug($this->view); die();
- $pdf = new wpsg_fpdf();
+ $pdf = new wpsg_fpdf();
$pdf->SetAutoPageBreak(true, 5);
AddRechnungPage($this, $pdf);
@@ -265,5 +265,5 @@
$height_y = $pdf->getY();
- $height = 2 + $pdf->MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, utf8_encode($produkt_text), 0, 'L', 0, $produkt_text_cell_width);
+ $height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width);
//$height += 3 + 5 + $pdf->getY() - $height_y;
@@ -280,26 +280,6 @@
$pdf->setXY($prod_left + 112, $prod_top + $offset);
$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');
-
- // Preis eines Produktes
- if ($this->view['basket']['noMwSt'] == '1')
- {
-
- // Innergemeinschaftliche Lieferung, hier Netto Preis
- $preis = $p['preis_netto'];
-
- }
- else
- {
-
- if ($this->getFrontendTaxview() == WPSG_BRUTTO || $this->get_option('wpsg_kleinunternehmer') == '1')
- {
- $preis = $p['preis_brutto'];
- }
- else
- {
- $preis = $p['preis_netto'];
- }
-
- }
+
+ $preis = $p['preis'];
$pdf->setXY($prod_left + 127, $prod_top + $offset);
@@ -326,5 +306,5 @@
$cellY = $pdf->getY();
- $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, utf8_encode($produktBeschreibung), 0, 'L', 0, $produkt_text_cell_width);
+ $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width);
$pBeschreibungHeight = $pdf->getY() - $cellY - $height + 1;
$pdf->SetFont('Arial', '', 9);
@@ -342,5 +322,5 @@
$variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));
- $height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, utf8_encode(wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key'])), 0, 'L', 0, $produkt_text_cell_width);
+ $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);
//$height += 5;
@@ -361,5 +341,5 @@
{
- $height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, utf8_encode(wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct))), 0, 'L', 0, $produkt_text_cell_width);
+ $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct)), 0, 'L', 0, $produkt_text_cell_width);
}
@@ -781,5 +761,5 @@
{
- $pdf->MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, utf8_encode($this->get_option('wpsg_kleinunternehmer_text')));
+ $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, $this->get_option('wpsg_kleinunternehmer_text'));
$offset += 15;
@@ -798,7 +778,5 @@
$offset += 10;
- $pdf->MultiCell($prod_left, $prod_top + $offset, 5, utf8_encode(
- wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date))
- ));
+ $pdf->wpsg_MultiCell($prod_left, $prod_top + $offset, 5, wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date)));
$offset += 5;
@@ -813,5 +791,6 @@
{
- $pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));
+ //$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));
+ $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $this->view['fussText']);
$pdf->SetFont('Arial', 'B', 9);
$offset += 10;
@@ -844,5 +823,5 @@
$start = $pdf->getY();
- $pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($shipping_adress), 0, 'L', 0, 100);
+ $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $shipping_adress, 0, 'L', 0, 100);
$offset += $pdf->getY() - $start;
@@ -865,5 +844,5 @@
{
- $bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."'");
+ $bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."' ORDER BY `pos` ASC, `id` ASC ");
if ($bvars['typ'] == "1") // Auswahl
@@ -888,5 +867,5 @@
$pdf->Text($prod_left, $prod_top + $offset, __("Angaben wÀhrend der Bestellung", "wpsg").":");
$pdf->SetFont('Arial', '', 9);
- $pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($strBVars));
+ $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $strBVars);
}
Index: /views/mods/mod_relatedproducts/settings_edit.phtml
===================================================================
--- /views/mods/mod_relatedproducts/settings_edit.phtml (revision 5371)
+++ /views/mods/mod_relatedproducts/settings_edit.phtml (revision 5382)
@@ -12,5 +12,11 @@
get_option('wpsg_mod_relatedproducts_showBasketLimit'), array('help' => 'wpsg_mod_relatedproducts_showBasketLimits')); ?>
-view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showBasketTemplate'), array('help' => 'wpsg_mod_relatedproducts_showBasketTemplate')); ?>
+view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showBasketTemplate'), array('help' => 'wpsg_mod_relatedproducts_showBasketTemplate')); ?>
+
+
+get_option('wpsg_mod_relatedproducts_showAjaxDialog'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialog')); ?>
+
+get_option('wpsg_mod_relatedproducts_showAjaxDialogLimit'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogLimits')); ?>
+view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogTemplate')); ?>
@@ -25,4 +31,11 @@
} ).change();
+
+ jQuery('#wpsg_mod_relatedproducts_showAjaxDialog').bind('change', function() {
+
+ if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_relatedproducts_showAjaxDialog_activ').show();
+ else jQuery('.wpsg_mod_relatedproducts_showAjaxDialog_activ').hide();
+
+ } ).change();
} );
Index: /views/mods/mod_request/requestpage.phtml
===================================================================
--- /views/mods/mod_request/requestpage.phtml (revision 5371)
+++ /views/mods/mod_request/requestpage.phtml (revision 5382)
@@ -169,5 +169,5 @@
- |