Commit 8b4d6801050b956ad4df4001a49ab28730506bac
1 parent
3cdeda29
add local config
Showing
3 changed files
with
12 additions
and
45 deletions
Show diff stats
src/lib/models/orders.php
| @@ -374,31 +374,20 @@ class orders extends \db | @@ -374,31 +374,20 @@ class orders extends \db | ||
| 374 | lang_id = :lang_id | 374 | lang_id = :lang_id |
| 375 | LIMIT 1 | 375 | LIMIT 1 |
| 376 | ) AS type_alias, | 376 | ) AS type_alias, |
| 377 | - ( | 377 | + ( |
| 378 | SELECT | 378 | SELECT |
| 379 | alias | 379 | alias |
| 380 | FROM | 380 | FROM |
| 381 | - public.subtypes_i18n | 381 | + public.catalog_i18n |
| 382 | WHERE | 382 | WHERE |
| 383 | - subtype = | 383 | + catalog = |
| 384 | ( | 384 | ( |
| 385 | SELECT | 385 | SELECT |
| 386 | - subtype | 386 | + catalog |
| 387 | FROM | 387 | FROM |
| 388 | public.items | 388 | public.items |
| 389 | WHERE | 389 | WHERE |
| 390 | - id = public.orders2items.item_id | ||
| 391 | - LIMIT 1 | ||
| 392 | - ) | ||
| 393 | - AND | ||
| 394 | - type = | ||
| 395 | - ( | ||
| 396 | - SELECT | ||
| 397 | - type | ||
| 398 | - FROM | ||
| 399 | - public.items | ||
| 400 | - WHERE | ||
| 401 | - id = public.orders2items.item_id | 390 | + id = public.orders2items_1c.item_id |
| 402 | LIMIT 1 | 391 | LIMIT 1 |
| 403 | ) | 392 | ) |
| 404 | AND | 393 | AND |
src/lib/models/orders_1c.php
| @@ -378,23 +378,12 @@ class orders_1c extends \db | @@ -378,23 +378,12 @@ class orders_1c extends \db | ||
| 378 | SELECT | 378 | SELECT |
| 379 | alias | 379 | alias |
| 380 | FROM | 380 | FROM |
| 381 | - public.subtypes_i18n | 381 | + public.catalog_i18n |
| 382 | WHERE | 382 | WHERE |
| 383 | - subtype = | 383 | + catalog = |
| 384 | ( | 384 | ( |
| 385 | SELECT | 385 | SELECT |
| 386 | - subtype | ||
| 387 | - FROM | ||
| 388 | - public.items | ||
| 389 | - WHERE | ||
| 390 | - id = public.orders2items_1c.item_id | ||
| 391 | - LIMIT 1 | ||
| 392 | - ) | ||
| 393 | - AND | ||
| 394 | - type = | ||
| 395 | - ( | ||
| 396 | - SELECT | ||
| 397 | - type | 386 | + catalog |
| 398 | FROM | 387 | FROM |
| 399 | public.items | 388 | public.items |
| 400 | WHERE | 389 | WHERE |
src/lib/models/shipments.php
| @@ -378,27 +378,16 @@ class shipments extends \db | @@ -378,27 +378,16 @@ class shipments extends \db | ||
| 378 | SELECT | 378 | SELECT |
| 379 | alias | 379 | alias |
| 380 | FROM | 380 | FROM |
| 381 | - public.subtypes_i18n | 381 | + public.catalog_i18n |
| 382 | WHERE | 382 | WHERE |
| 383 | - subtype = | 383 | + catalog = |
| 384 | ( | 384 | ( |
| 385 | SELECT | 385 | SELECT |
| 386 | - subtype | 386 | + catalog |
| 387 | FROM | 387 | FROM |
| 388 | public.items | 388 | public.items |
| 389 | WHERE | 389 | WHERE |
| 390 | - id = public.shipments2items.item_id | ||
| 391 | - LIMIT 1 | ||
| 392 | - ) | ||
| 393 | - AND | ||
| 394 | - type = | ||
| 395 | - ( | ||
| 396 | - SELECT | ||
| 397 | - type | ||
| 398 | - FROM | ||
| 399 | - public.items | ||
| 400 | - WHERE | ||
| 401 | - id = public.shipments2items.item_id | 390 | + id = public.orders2items_1c.item_id |
| 402 | LIMIT 1 | 391 | LIMIT 1 |
| 403 | ) | 392 | ) |
| 404 | AND | 393 | AND |