Subversion-Projekte lars-tiefland.laravel_shop

Revision

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

Revision 837 Revision 838
Zeile 160... Zeile 160...
160 
                            z.id,
 160 
                            z.id,
161 
                            z.name,
 161 
                            z.name,
162 
                            z.internal_name,
 162 
                            z.internal_name,
163 
                            z.discount,
 163 
                            z.discount,
164 
                            z.shipping_text AS versandtextbaustein,
 164 
                            z.shipping_text AS versandtextbaustein,
165 
                            z.info_im_shop
 165 
                            z.info_shop
166 
                        FROM
 166 
                        FROM
167 
                            shipping_payment_methods vz
 167 
                            shipping_payment_methods vz
168 
                        JOIN
 168 
                        JOIN
169 
                            payment_methods z
 169 
                            payment_methods z
170 
                        ON
 170 
                        ON
Zeile 197... Zeile 197...
197 
                                if ( $_SESSION["SHOP"]["Lieferadresse"] == "abholung" )
 197 
                                if ( $_SESSION["SHOP"]["Lieferadresse"] == "abholung" )
198 
                                {
 198 
                                {
199 
                                    $name = "Abholung - " . $zRow->name;
 199 
                                    $name = "Abholung - " . $zRow->name;
200 
                                    $preis = 0;
 200 
                                    $preis = 0;
201 
                                }
 201 
                                }
202 
                                $beschreibung = $zRow->info_im_shop;
 202 
                                $beschreibung = $zRow->info_shop;
203 
                                if ( $beschreibung && $vRow->info_shop )
 203 
                                if ( $beschreibung && $vRow->info_shop )
204 
                                {
 204 
                                {
205 
                                    $beschreibung .= "<br/><br/>";
 205 
                                    $beschreibung .= "<br/><br/>";
206 
                                }
 206 
                                }
207 
                                if ( $vRow->info_shop )
 207 
                                if ( $vRow->info_shop )
Zeile 318... Zeile 318...
318 
                                if ( $_SESSION["SHOP"]["Lieferadresse"] == "abholung" )
 318 
                                if ( $_SESSION["SHOP"]["Lieferadresse"] == "abholung" )
319 
                                {
 319 
                                {
320 
                                    $name = "Abholung - " . $vzRow->name;
 320 
                                    $name = "Abholung - " . $vzRow->name;
321 
                                    $preis = 0;
 321 
                                    $preis = 0;
322 
                                }
 322 
                                }
323 
                                $beschreibung = $vzRow->info_im_shop;
 323 
                                $beschreibung = $vzRow->info_shop;
324 
                                if ( $beschreibung && $vRow->info_shop )
 324 
                                if ( $beschreibung && $vRow->info_shop )
325 
                                {
 325 
                                {
326 
                                    $beschreibung .= "<br/><br/>";
 326 
                                    $beschreibung .= "<br/><br/>";
327 
                                }
 327 
                                }
328 
                                if ( $vRow->info_shop )
 328 
                                if ( $vRow->info_shop )