Subversion-Projekte lars-tiefland.ci

Revision

Revision 1431 | Revision 1437 | Zur aktuellen Revision | Ganze Datei anzeigen | Leerzeichen ignorieren | Details | Blame | Letzte Änderung | Log anzeigen | RSS feed

Revision 1431 Revision 1432
Zeile 3... Zeile 3...
3
/**
3
/**
4
 *
4
 *
5
 * @package WebanOS CI
5
 * @package WebanOS CI
6
 * @author Lars Tiefland <ltiefland@gmail.com> 
6
 * @author Lars Tiefland <ltiefland@gmail.com> 
7
 * @copyright 2016
7
 * @copyright 2016
8
 * @version $Rev: 1431 $
8
 * @version $Rev: 1432 $
9
 */
9
 */
Zeile 10... Zeile 10...
10
 
10
 
11
class Order_model extends CI_Model
11
class Order_model extends CI_Model
12
{
12
{
Zeile 160... Zeile 160...
160
				default:
160
				default:
Zeile 161... Zeile 161...
161
 
161
 
162
					if ($GLOBALS["web_rechte"]["online_shop"]["language"]["standardsprache"] == "UK")
162
					if ($GLOBALS["web_rechte"]["online_shop"]["language"]["standardsprache"] == "UK")
163
					{
163
					{
164
						$coFeld = "co.`name-en`";
164
						$coFeld = "co.`name-en`";
165
						$coFeldSip = "coShip.`name-en`";
165
						$coFeldSip = "coShip.id";
166
						$coFeldBill = "coBill.`name-en`";
166
						$coFeldBill = "coBill.id`";
167
					}
167
					}
168
					else
168
					else
169
					{
169
					{
170
						$coFeld = "co.`name-ger`";
170
						$coFeld = "co.`name-ger`";
Zeile 560... Zeile 560...
560
			ON
560
			ON
561
				l.ID=b.Login
561
				l.ID=b.Login
562
			".$doc_join."
562
			".$doc_join."
563
			".$bp_join."
563
			".$bp_join."
564
			".$adresse_join."
564
			".$adresse_join."
-
 
565
			".$logistiker_join."
565
			JOIN
566
			JOIN
566
				shops s
567
				shops s
567
			ON
568
			ON
568
				s.id=b.shops_id
569
				s.id=b.shops_id
569
			JOIN
570
			JOIN