WebSVN – lars-tiefland.laravel_shop – Diff – /trunk/app/Http/Controllers/ShippingController.php



                    vz.payment_method_id=z.id  
            ";
            $r = DB::connection( 'mysql' )->select( $sql );
            $rufnamen[] = "- Bezahlarten -";
            foreach ( $r as $row )
            {
                $ini_name = $row->internal_name;
                if ( $row->internal_name == "sofortueberweisung" )
                {
                    $ini_name = "ueberweisung";
                }

                ";
                $r = DB::select( $sql );
                $row = $r[0];
                $rang = $row->rank;
                $sql = "SELECT
                        id,
                        name,
                        conditions,
                        shipping_text AS versandtextbaustein
                        -- zahlart_index
                    FROM

                    $sqlCond = implode( " AND ", $sqlCondArr );
                    $sql .= "
                        AND
                            " . $sqlCond . "
                    ";
                }
                $vR = DB::select( $sql );
                if ( !count( $vR ) )
                {
                    $_SESSION["versandFehler"] = "Wir versenden NICHT an diese Adresse! Bitte geben Sie eine andere Adresse ein!";
                }

                                if ( $vRow->info_mail )
                                {
                                    $beschreibung2 .= $vRow->info_mail;
                                }
                                $buffer[$zRow->internal_name . "_" . $vRow->id] = array(
                                    "additions"        => $vRow->additions,
                                    "ID"               => $zRow->internal_name . "_" . $vRow->id,
                                    "beschreibung"     => $beschreibung,
                                    "beschreibung2"    => $beschreibung2,
                                    "kurz"             => $name,
                                    "ultrakurz"        => $zRow->name,

                                /*if ( $vRow->info_mail )
                                {
                                    $beschreibung2 .= $vRow->info_mail;
				}*/
                                $buffer[$vzRow->internal_name . "_" . $vRow->id] = array(
                                    "additions"            => $vRow->additions,
                                    "ID"                   => $vzRow->internal_name . "_" . $vRow->id,
                                    "beschreibung"         => $beschreibung,
                                    //"beschreibung2"        => $beschreibung2,
                                    "kurz"                 => $name,
                                    "ultrakurz"            => $vzRow->name,

Revision 860	Revision 861
Zeile 23...	Zeile 23...
23	`vz.payment_method_id=z.id`	23	`vz.payment_method_id=z.id`
24	`";`	24	`";`
25	`$r = DB::connection( 'mysql' )->select( $sql );`	25	`$r = DB::connection( 'mysql' )->select( $sql );`
26	`$rufnamen[] = "- Bezahlarten -";`	26	`$rufnamen[] = "- Bezahlarten -";`
27	`foreach ( $r as $row )`	27	`foreach ( $r as $row )`
28	`{`	28	`{`
29	`$ini_name = $row->internal_name;`	29	`$ini_name = $row->internal_name;`
30	`if ( $row->internal_name == "sofortueberweisung" )`	30	`if ( $row->internal_name == "sofortueberweisung" )`
31	`{`	31	`{`
32	`$ini_name = "ueberweisung";`	32	`$ini_name = "ueberweisung";`
33	`}`	33	`}`
Zeile 66...	Zeile 66...
66	`";`	66	`";`
67	`$r = DB::select( $sql );`	67	`$r = DB::select( $sql );`
68	`$row = $r[0];`	68	`$row = $r[0];`
69	`$rang = $row->rank;`	69	`$rang = $row->rank;`
70	`$sql = "SELECT`	70	`$sql = "SELECT`
71	`id,`	71	`id,`
72	`name,`	72	`name,`
73	`conditions,`	73	`conditions,`
74	`shipping_text AS versandtextbaustein`	74	`shipping_text AS versandtextbaustein`
75	`-- zahlart_index`	75	`-- zahlart_index`
76	`FROM`	76	`FROM`
Zeile 121...	Zeile 121...
121	`$sqlCond = implode( " AND ", $sqlCondArr );`	121	`$sqlCond = implode( " AND ", $sqlCondArr );`
122	`$sql .= "`	122	`$sql .= "`
123	`AND`	123	`AND`
124	`" . $sqlCond . "`	124	`" . $sqlCond . "`
125	`";`	125	`";`
126	`}`	126	`}`
127	`$vR = DB::select( $sql );`	127	`$vR = DB::select( $sql );`
128	`if ( !count( $vR ) )`	128	`if ( !count( $vR ) )`
129	`{`	129	`{`
130	`$_SESSION["versandFehler"] = "Wir versenden NICHT an diese Adresse! Bitte geben Sie eine andere Adresse ein!";`	130	`$_SESSION["versandFehler"] = "Wir versenden NICHT an diese Adresse! Bitte geben Sie eine andere Adresse ein!";`
131	`}`	131	`}`
Zeile 225...	Zeile 225...
225	`if ( $vRow->info_mail )`	225	`if ( $vRow->info_mail )`
226	`{`	226	`{`
227	`$beschreibung2 .= $vRow->info_mail;`	227	`$beschreibung2 .= $vRow->info_mail;`
228	`}`	228	`}`
229	`$buffer[$zRow->internal_name . "_" . $vRow->id] = array(`	229	`$buffer[$zRow->internal_name . "_" . $vRow->id] = array(`
230	`"additions" => $vRow->additions,`	230	`"additions" => $vRow->additions,`
231	`"ID" => $zRow->internal_name . "_" . $vRow->id,`	231	`"ID" => $zRow->internal_name . "_" . $vRow->id,`
232	`"beschreibung" => $beschreibung,`	232	`"beschreibung" => $beschreibung,`
233	`"beschreibung2" => $beschreibung2,`	233	`"beschreibung2" => $beschreibung2,`
234	`"kurz" => $name,`	234	`"kurz" => $name,`
235	`"ultrakurz" => $zRow->name,`	235	`"ultrakurz" => $zRow->name,`
Zeile 349...	Zeile 349...
349	`/*if ( $vRow->info_mail )`	349	`/*if ( $vRow->info_mail )`
350	`{`	350	`{`
351	`$beschreibung2 .= $vRow->info_mail;`	351	`$beschreibung2 .= $vRow->info_mail;`
352	`}*/`	352	`}*/`
353	`$buffer[$vzRow->internal_name . "_" . $vRow->id] = array(`	353	`$buffer[$vzRow->internal_name . "_" . $vRow->id] = array(`
354	`"additions" => $vRow->additions,`	354	`"additions" => $vRow->additions,`
355	`"ID" => $vzRow->internal_name . "_" . $vRow->id,`	355	`"ID" => $vzRow->internal_name . "_" . $vRow->id,`
356	`"beschreibung" => $beschreibung,`	356	`"beschreibung" => $beschreibung,`
357	`//"beschreibung2" => $beschreibung2,`	357	`//"beschreibung2" => $beschreibung2,`
358	`"kurz" => $name,`	358	`"kurz" => $name,`
359	`"ultrakurz" => $vzRow->name,`	359	`"ultrakurz" => $vzRow->name,`

Subversion-Projekte lars-tiefland.laravel_shop

(root)/trunk/app/Http/Controllers/ShippingController.php – Revision 860 → 861