Subversion-Projekte lars-tiefland.laravel_shop

Revision

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

Revision 944 Revision 946
Zeile 161... Zeile 161...
161 
                        }
 161 
                        }
Zeile 162... Zeile 162...
162 
 
 162 
 
163 
 
 163 
 
164 
                        return true;
 - 
 
Zeile 165... Zeile 164...
165 
                    }
 164 
                        return true;
166 
                }
 165 
                    }
167 
 
 166 
 
168 
                $sql = "SELECT
 167 
                    $sql = "SELECT
169 
                        z.id,
 168 
                            z.id,
170 
                        z.name,
 169 
                            z.name,
171 
                        z.internal_name,
 170 
                            z.internal_name,
172 
                        z.discount,
 171 
                            z.discount,
173 
                        z.shipping_text AS versandtextbaustein,
 172 
                            z.shipping_text AS versandtextbaustein,
174 
                        z.info_in_shop
 173 
                            z.info_in_shop
175 
                    FROM
 174 
                        FROM
176 
                        shipping_payment_methods vz
 175 
                            shipping_payment_methods vz
177 
                    JOIN
 176 
                        JOIN
178 
                        payment_methods z
 177 
                            payment_methods z
179 
                    ON
 178 
                        ON
180 
                        z.id=vz.payment_method_id
 179 
                            z.id=vz.payment_method_id
181 
                    WHERE
 180 
                        WHERE
182 
                        shipping_id IN (" . implode( ",", $shippingIds ) . ")
 - 
 
183 
                ";
 - 
 
184 
                if ( isset( $_GET['vRufname'] ) && is_numeric( $_GET['vRufname'] ) )
 - 
 
185 
                {
 - 
 
186 
                    $sql .= " AND z.id = " . $_GET['vRufname'];
 - 
 
187 
                }
 - 
 
188 
                $zR = DB::select( $sql );
 - 
 
189 
                foreach ( $zR as $zRow )
 181 
                            shipping_id IN (" . implode( ",", $shippingIds ) . ")
190 
                {
 182 
                    ";
191 
                    if ( $zRow->internal_name != "nicht_belegt" )
 - 
 
192 
                    {
 183 
                    if ( isset( $_GET['vRufname'] ) && is_numeric( $_GET['vRufname'] ) )
193 
                        $ini_name = $zRow->internal_name;
 184 
                    {
194 
                        if ( $ini_name == "sofortueberweisung" )
 185 
                        $sql .= " AND z.id = " . $_GET['vRufname'];
195 
                        {
 - 
 
196 
                            $ini_name = "ueberweisung";
 186 
                    }
197 
                        }
 187 
                    $zR = DB::select( $sql );
198 
                        if ( $GLOBALS["INI"]["PayPalPlus"]["aktiv"] != 1 )
 - 
 
199 
                        {
 - 
 
200 
                            $row->name = ( str_replace( "\r\n", "<br>", $row->name ) );
 188 
                    foreach ( $zR as $zRow )
201 
                        }
 - 
 
202 
                        if ( ( isset( $GLOBALS["INI"][$ini_name]["aktiv"] ) && $GLOBALS["INI"][$ini_name]["aktiv"] == 1 && $_SESSION["zahlarten"][$ini_name] !== false ) || !in_array( $zRow->internal_name, $GLOBALS["zahlsysteme"] ) )
 - 
 
203 
                        {
 - 
 
204 
                            $preis = $vRow->price;
 - 
 
205 
                            $name = $vRow->name . " - " . $zRow->name;
 - 
 
206 
                            if ( isset( $_SESSION["SHOP"]["Lieferadresse"] ) && $_SESSION["SHOP"]["Lieferadresse"] == "abholung" )
 - 
 
207 
                            {
 - 
 
208 
                                $name = "Abholung - " . $zRow->name;
 189 
                    {
209 
                                $preis = 0;
 190 
                        if ( $zRow->internal_name != "nicht_belegt" )
210 
                            }
 191 
                        {
211 
                            $beschreibung = $zRow->info_in_shop;
 192 
                            $ini_name = $zRow->internal_name;
212 
                            if ( $beschreibung && $vRow->info_shop )
 193 
                            if ( $ini_name == "sofortueberweisung" )
213 
                            {
 194 
                            {
214 
                                $beschreibung .= "<br/><br/>";
 195 
                                $ini_name = "ueberweisung";
215 
                            }
 196 
                            }
216 
                            if ( $vRow->info_shop )
 197 
                            if ( $GLOBALS["INI"]["PayPalPlus"]["aktiv"] != 1 )
- 
 
 198 
                            {
- 
 
 199 
                                $row->name = ( str_replace( "\r\n", "<br>", $row->name ) );
- 
 
 200 
                            }
- 
 
 201 
                            if ( ( isset( $GLOBALS["INI"][$ini_name]["aktiv"] ) && $GLOBALS["INI"][$ini_name]["aktiv"] == 1 && $_SESSION["zahlarten"][$ini_name] !== false ) || !in_array( $zRow->internal_name, $GLOBALS["zahlsysteme"] ) )
- 
 
 202 
                            {
- 
 
 203 
                                $preis = $vRow->price;
- 
 
 204 
                                $name = $vRow->name . " - " . $zRow->name;
- 
 
 205 
                                if ( isset( $_SESSION["SHOP"]["Lieferadresse"] ) && $_SESSION["SHOP"]["Lieferadresse"] == "abholung" )
- 
 
 206 
                                {
- 
 
 207 
                                    $name = "Abholung - " . $zRow->name;
- 
 
 208 
                                    $preis = 0;
- 
 
 209 
                                }
- 
 
 210 
                                $beschreibung = $zRow->info_in_shop;
- 
 
 211 
                                if ( $beschreibung && $vRow->info_shop )
- 
 
 212 
                                {
- 
 
 213 
                                    $beschreibung .= "<br/><br/>";
- 
 
 214 
                                }
- 
 
 215 
                                if ( $vRow->info_shop )
217 
                            {
 216 
                                {
218 
                                $beschreibung .= $vRow->info_shop;
 217 
                                    $beschreibung .= $vRow->info_shop;
219 
                            }
 218 
                                }
220 
                            $beschreibung2 = $zRow->versandtextbaustein;
 219 
                                $beschreibung2 = $zRow->versandtextbaustein;
221 
                            if ( $beschreibung2 && $row->versandtextbaustein )
 220 
                                if ( $beschreibung2 && $row->versandtextbaustein )
222 
                            {
 221 
                                {
223 
                                $beschreibung2 .= "<br><br/>";
 222 
                                    $beschreibung2 .= "<br><br/>";
224 
                            }
 223 
                                }
225 
                            if ( $row->versandtextbaustein )
 224 
                                if ( $row->versandtextbaustein )
226 
                            {
 225 
                                {
227 
                                $beschreibung2 .= $row->versandtextbaustein;
 226 
                                    $beschreibung2 .= $row->versandtextbaustein;
228 
                            }
 227 
                                }
229 
                            if ( $beschreibung2 && $vRow->info_mail )
 228 
                                if ( $beschreibung2 && $vRow->info_mail )
230 
                            {
 229 
                                {
231 
                                $beschreibung2 .= "<br/><br/>";
 230 
                                    $beschreibung2 .= "<br/><br/>";
232 
                            }
 231 
                                }
233 
                            if ( $vRow->info_mail )
 232 
                                if ( $vRow->info_mail )
234 
                            {
 233 
                                {
235 
                                $beschreibung2 .= $vRow->info_mail;
 234 
                                    $beschreibung2 .= $vRow->info_mail;
236 
                            }
 235 
                                }
237 
                            $buffer[$zRow->internal_name . "_" . $vRow->id] = array(
 236 
                                $buffer[$zRow->internal_name . "_" . $vRow->id] = array(
238 
                                "additions"        => $vRow->additions,
 237 
                                    "additions"        => $vRow->additions,
239 
                                "ID"               => $zRow->internal_name . "_" . $vRow->id,
 238 
                                    "ID"               => $zRow->internal_name . "_" . $vRow->id,
240 
                                "beschreibung"     => $beschreibung,
 239 
                                    "beschreibung"     => $beschreibung,
241 
                                "beschreibung2"    => $beschreibung2,
 240 
                                    "beschreibung2"    => $beschreibung2,
242 
                                "kurz"             => $name,
 241 
                                    "kurz"             => $name,
243 
                                "ultrakurz"        => $zRow->name,
 242 
                                    "ultrakurz"        => $zRow->name,
244 
                                "preis"            => $preis,
 243 
                                    "preis"            => $preis,
245 
                                "gesamt"           => $preis,
 244 
                                    "gesamt"           => $preis,
246 
                                "rufname"          => $zRow->internal_name,
 245 
                                    "rufname"          => $zRow->internal_name,
247 
                                "versand_abschlag" => $zRow->discount,
 246 
                                    "versand_abschlag" => $zRow->discount,
Zeile -... Zeile 247...
- 
 
 247 
                                    "versandgruppe"    => $vgId,
248 
                                "versandgruppe"    => $vgId,
 248 
                                    //"zahlart_index"    => $row->zahlart_index,
249 
                                //"zahlart_index"    => $row->zahlart_index,
 - 
 
Zeile -... Zeile 249...
- 
 
 249 
                                );
250 
                            );
 250 
 
251 
 
 251 
                            }
252 
                        }
 252 
                        }
253 
                    }
 253 
 
254 
 
 254 
                    }