Project-Pro/pomysloweprezenty.pl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor payment confirmation template and fix status check

Browse Source
This commit is contained in:
Jacek Pyziak
2024-10-29 11:25:46 +01:00
parent 082feb6f2a
commit fbb0231089
25 changed files with 1595 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/temp/2/s_cache_21a4da48e5fa14e992150d116fb212cc
View File

@@ -1 +1 @@
YToyOntpOjA7aToxNjk0MDA3MTQxO2k6MTtzOjIwOiJwb215c2xvd2VwcmV6ZW50eS5wbCI7fQ==
YToyOntpOjA7aToxNjkzOTE3NzIzO2k6MTtzOjg6Ik1hcmlhbmVrIjt9

2
admin/temp/3/s_cache_3a23324137621a1dfafc3ee613d86e94
View File

@@ -1 +1 @@
YToyOntpOjA7aToxNjc4NzMyMTQ4O2k6MTtzOjI6InBsIjt9
YToyOntpOjA7aToxNjkzOTQ2ODIzO2k6MTtzOjI6InBsIjt9

2
admin/temp/4/s_cache_44e3d63e885545f6b55debe0486ec1e4
View File

File diff suppressed because one or more lines are too long

2
admin/temp/4/s_cache_4b916ae533b4ded88ddc3edfe99de1be
View File

@@ -1 +1 @@
YToyOntpOjA7aToxNzI1MTk4NDExO2k6MTthOjM5OntzOjk6ImZpcm1fbmFtZSI7czoyMDoicG9teXNsb3dlcHJlemVudHkucGwiO3M6MTE6ImZpcm1fYWRyZXNzIjtzOjA6IiI7czoxNToiYWRkaXRpb25hbF9pbmZvIjtzOjI1OToiPHA+PHN0cm9uZz5NYXN6IHB5dGFuaWE/IFphZHp3b8WEIGRvIG5hcy48L3N0cm9uZz48L3A+DQoNCjxwPnRlbC4gPGEgaHJlZj0idGVsOi8vNTMwNzU1Nzc0Ij41MzAgNzU1IDc3NDwvYT48YnIgLz4NCmVtYWlsOiZuYnNwOzxhIGhyZWY9Im1haWx0bzpza2xlcEBwb215c2xvd2VwcmV6ZW50eS5wbCI+c2tsZXBAcG9teXNsb3dlcHJlemVudHkucGw8L2E+PGJyIC8+DQp1bC4gS3Jha293c2thIDE1Ni8xMDQsIDM1LTUwNiBSemVzeiZvYWN1dGU7dzwvcD4NCiI7czoxMjoiY29udGFjdF9mb3JtIjtzOjE6IjEiO3M6MTM6ImNvbnRhY3RfZW1haWwiO3M6MjY6InNrbGVwQHBvbXlzbG93ZXByZXplbnR5LnBsIjtzOjEwOiJlbWFpbF9ob3N0IjtzOjI1OiJtYWlsLnBvbXlzbG93ZXByZXplbnR5LnBsIjtzOjEwOiJlbWFpbF9wb3J0IjtzOjI6IjI1IjtzOjExOiJlbWFpbF9sb2dpbiI7czoyNjoic2tsZXBAcG9teXNsb3dlcHJlemVudHkucGwiO3M6MTQ6ImVtYWlsX3Bhc3N3b3JkIjtzOjk6IkxlZ2lhMTkxNiI7czoxMToiZ29vZ2xlX21hcHMiO3M6MDoiIjtzOjEzOiJmYWNlYm9va19saW5rIjtzOjA6IiI7czoxNDoic3RhdGlzdGljX2NvZGUiO3M6MDoiIjtzOjg6Imh0YWNjZXNzIjtzOjA6IiI7czo2OiJyb2JvdHMiO3M6MDoiIjtzOjIyOiJzaG9wX2JhbmtfYWNjb3VudF9pbmZvIjtzOjIyODoiPHA+UHJvamVjdC1Qcm88YnIgLz4NCk5lc3RCYW5rJm5ic3A7PHN0cm9uZz4yMiAyNTMwIDAwMDggMjA1MSAxMDUwIDY3NjMgMDAwMTwvc3Ryb25nPjwvcD4NCg0KPHA+S3dvdGE6IDxzdHJvbmc+W0tXT1RBXTwvc3Ryb25nPjxiciAvPg0KVyB0eXR1bGUgcHJvc3rEmSB3cGlzYcSHIG51bWVyIHphbSZvYWN1dGU7d2llbmlhOiZuYnNwOzxzdHJvbmc+W05SLVpBTU9XSUVOSUFdPC9zdHJvbmc+PC9wPg0KIjtzOjY6InVwZGF0ZSI7czoxOiIxIjtzOjE0OiJib290X2FuaW1hdGlvbiI7czowOiIiO3M6MTc6Im5ld3NsZXR0ZXJfaGVhZGVyIjtzOjE1MDoiPGRpdiBzdHlsZT0iYm9yZGVyLWJvdHRvbTo1cHggc29saWQgI2I3MTc0ZDsgcGFkZGluZzoyMHB4OyB0ZXh0LWFsaWduOmNlbnRlciI+PGltZyBhbHQ9IiIgc3JjPSIvbGF5b3V0L2ltYWdlcy9sb2dvLnN2ZyIgc3R5bGU9IndpZHRoOjIwOHB4IiAvPjwvZGl2Pg0KIjtzOjE3OiJuZXdzbGV0dGVyX2Zvb3RlciI7czo3NDg6IjxkaXYgc3R5bGU9ImJvcmRlci10b3A6NXB4IHNvbGlkICNiNzE3NGQ7IHBhZGRpbmc6MjBweCAyMHB4IDAgMjBweCI+DQo8cCBzdHlsZT0idGV4dC1hbGlnbjpjZW50ZXIiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTJweCI+PGVtPlBvemRyYXdpYW15LDxiciAvPg0KWmVzcCZvYWN1dGU7xYIgcG9teXNsb3dlcHJlemVudHkucGw8YnIgLz4NCjxhIGhyZWY9Imh0dHBzOi8vcG9teXNsb3dlcHJlemVudHkucGwiPnBvbXlzbG93ZXByZXplbnR5LnBsPC9hPjwvZW0+PC9zcGFuPjwvcD4NCg0KPHAgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyIj48c3BhbiBzdHlsZT0iZm9udC1zaXplOjExcHgiPjxzcGFuIHN0eWxlPSJjb2xvcjojOTVhNWE2Ij5XaWFkb21vxZvEhyB6b3N0YcWCYSB3eWdlbmVyb3dhbmEgYXV0b21hdHljem5pZSwgcHJvc2lteSBuYSBuacSFIG5pZSBvZHBvd2lhZGHEhy4gJm5ic3A7QWJ5IHNrb250YWt0b3dhxIcgc2nEmSB6IHNlcndpc2VtIDxhIGhyZWY9Imh0dHBzOi8vcG9teXNsb3dlcHJlemVudHkucGwiPnBvbXlzbG93ZXByZXplbnR5LnBsPC9hPiwgcHJvc2lteSBvIHByemVzxYJhbmllIGUtbWFpbGEgbmEgYWRyZXMmbmJzcDs8L3NwYW4+PGEgaHJlZj0ibWFpbHRvOnNrbGVwQHBvbXlzbG93ZXByZXplbnR5LnBsIiB0YXJnZXQ9Il9ibGFuayI+PHNwYW4gc3R5bGU9ImNvbG9yOiM5NWE1YTYiPnNrbGVwQHBvbXlzbG93ZXByZXplbnR5LnBsPC9zcGFuPjwvYT48L3NwYW4+PC9wPg0KPC9kaXY+DQoiO3M6MTA6ImhvdHBheV9hcGkiO3M6MDoiIjtzOjU6ImRldmVsIjtzOjE6IjAiO3M6Mzoic3NsIjtzOjE6IjAiO3M6MTQ6Imh0YWNjZXNzX2NhY2hlIjtzOjE6IjEiO3M6MTM6ImZyZWVfZGVsaXZlcnkiO3M6NToiOTkuMDAiO3M6MTg6InByemVsZXd5MjRfc2FuZGJveCI7czoxOiIwIjtzOjIyOiJwcnplbGV3eTI0X21lcmNoYW50X2lkIjtzOjA6IiI7czoxODoicHJ6ZWxld3kyNF9jcmNfa2V5IjtzOjA6IiI7czoxMDoidXBkYXRlX2tleSI7czozMjoiZmZmYTY4M2VhZWMxNTZkZDA0Y2IwMzdmZTQ4MzJkNjkiO3M6NzoidHBheV9pZCI7czo2OiIxMTM1NzUiO3M6MTI6InRwYXlfc2FuZGJveCI7czoxOiIwIjtzOjE4OiJ0cGF5X3NlY3VyaXR5X2NvZGUiO3M6MTk6Ik4+QiNpRiokTEg1QnwzKFp6eSQiO3M6NjoicGlrc2VsIjtzOjA6IiI7czoxMzoiZ2VuZXJhdGVfd2VicCI7czoxOiIxIjtzOjEyOiJsYXp5X2xvYWRpbmciO3M6MToiMSI7czoxMjoiZWtvbWlfc3VydmV5IjtzOjA6IiI7czoyMToiZ29vZ2xlX3RhZ19tYW5hZ2VyX2lkIjtzOjEyOiJHVE0tTUdHMjgyQlEiO3M6MTQ6ImluZmluaXRlc2Nyb2xsIjtzOjE6IjAiO3M6MjU6IndhcmVob3VzZV9tZXNzYWdlX3plcm9fcGwiO3M6MTU6Ild5c3nFgmFteSB3IDQ4ISI7czoyODoid2FyZWhvdXNlX21lc3NhZ2Vfbm9uemVyb19wbCI7czoxNToiV3lzecWCYW15IHcgNDghIjt9fQ==
YToyOntpOjA7aToxNzI0MjYzMTIxO2k6MTthOjM5OntzOjk6ImZpcm1fbmFtZSI7czo4OiJNYXJpYW5layI7czoxMToiZmlybV9hZHJlc3MiO3M6MDoiIjtzOjE1OiJhZGRpdGlvbmFsX2luZm8iO3M6MjQxOiI8cD48c3Ryb25nPk1hc3ogcHl0YW5pYT8gWmFkendvxYQgZG8gbmFzLjwvc3Ryb25nPjwvcD4NCg0KPHA+dGVsLiA8YSBocmVmPSJ0ZWw6Ly81MzA3NTU3NzQiPjUzMCA3NTUgNzc0PC9hPjxiciAvPg0KZW1haWw6Jm5ic3A7PGEgaHJlZj0ibWFpbHRvOnNrbGVwQG1hcmlhbmVrLnBsIj5za2xlcEBtYXJpYW5lay5wbDwvYT48YnIgLz4NCnVsLiBLcmFrb3dza2EgMTU2LzEwNCwgMzUtNTA2IFJ6ZXN6Jm9hY3V0ZTt3PC9wPg0KIjtzOjEyOiJjb250YWN0X2Zvcm0iO3M6MToiMSI7czoxMzoiY29udGFjdF9lbWFpbCI7czoxNzoic2tsZXBAbWFyaWFuZWsucGwiO3M6MTA6ImVtYWlsX2hvc3QiO3M6MTY6Im1haWwubWFyaWFuZWsucGwiO3M6MTA6ImVtYWlsX3BvcnQiO3M6MjoiMjUiO3M6MTE6ImVtYWlsX2xvZ2luIjtzOjE3OiJza2xlcEBtYXJpYW5lay5wbCI7czoxNDoiZW1haWxfcGFzc3dvcmQiO3M6OToiTGVnaWExOTE2IjtzOjExOiJnb29nbGVfbWFwcyI7czowOiIiO3M6MTM6ImZhY2Vib29rX2xpbmsiO3M6MDoiIjtzOjE0OiJzdGF0aXN0aWNfY29kZSI7czowOiIiO3M6ODoiaHRhY2Nlc3MiO3M6MDoiIjtzOjY6InJvYm90cyI7czowOiIiO3M6MjI6InNob3BfYmFua19hY2NvdW50X2luZm8iO3M6MjI4OiI8cD5Qcm9qZWN0LVBybzxiciAvPg0KTmVzdEJhbmsmbmJzcDs8c3Ryb25nPjIyIDI1MzAgMDAwOCAyMDUxIDEwNTAgNjc2MyAwMDAxPC9zdHJvbmc+PC9wPg0KDQo8cD5Ld290YTogPHN0cm9uZz5bS1dPVEFdPC9zdHJvbmc+PGJyIC8+DQpXIHR5dHVsZSBwcm9zesSZIHdwaXNhxIcgbnVtZXIgemFtJm9hY3V0ZTt3aWVuaWE6Jm5ic3A7PHN0cm9uZz5bTlItWkFNT1dJRU5JQV08L3N0cm9uZz48L3A+DQoiO3M6NjoidXBkYXRlIjtzOjE6IjEiO3M6MTQ6ImJvb3RfYW5pbWF0aW9uIjtzOjA6IiI7czoxNzoibmV3c2xldHRlcl9oZWFkZXIiO3M6MTYzOiI8ZGl2IHN0eWxlPSJib3JkZXItYm90dG9tOjVweCBzb2xpZCAjNzdjZGQxOyBwYWRkaW5nOjIwcHg7IHRleHQtYWxpZ246Y2VudGVyIj48aW1nIGFsdD0iIiBzcmM9Ii9sYXlvdXQvaW1hZ2VzL2xvZ28ucG5nIiBzdHlsZT0iaGVpZ2h0OjUwcHg7IHdpZHRoOjIwOHB4IiAvPjwvZGl2Pg0KIjtzOjE3OiJuZXdzbGV0dGVyX2Zvb3RlciI7czo2OTM6IjxkaXYgc3R5bGU9ImJvcmRlci10b3A6NXB4IHNvbGlkICM3N2NkZDE7IHBhZGRpbmc6MjBweCAyMHB4IDAgMjBweCI+DQo8cCBzdHlsZT0idGV4dC1hbGlnbjpjZW50ZXIiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTJweCI+PGVtPlBvemRyYXdpYW15LDxiciAvPg0KWmVzcG9sIE1BUklBTkVLLlBMPGJyIC8+DQo8YSBocmVmPSJodHRwczovL3d3dy5tYXJpYW5lay5wbCI+d3d3Lm1hcmlhbmVrLnBsPC9hPjwvZW0+PC9zcGFuPjwvcD4NCg0KPHAgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyIj48c3BhbiBzdHlsZT0iZm9udC1zaXplOjExcHgiPjxzcGFuIHN0eWxlPSJjb2xvcjojOTVhNWE2Ij5XaWFkb21vxZvEhyB6b3N0YcWCYSB3eWdlbmVyb3dhbmEgYXV0b21hdHljem5pZSwgcHJvc2lteSBuYSBuacSFIG5pZSBvZHBvd2lhZGHEhy4gJm5ic3A7QWJ5IHNrb250YWt0b3dhxIcgc2nEmSB6IHNlcndpc2VtIDxhIGhyZWY9Imh0dHBzOi8vd3d3Lm1hcmlhbmVrLnBsIj5NQVJJQU5FSy5QTDwvYT4sIHByb3NpbXkgbyBwcnplc8WCYW5pZSBlLW1haWxhIG5hIGFkcmVzJm5ic3A7PC9zcGFuPjxhIGhyZWY9Im1haWx0bzprb250YWt0QG1hcmlhbmVrLnBsIiB0YXJnZXQ9Il9ibGFuayI+PHNwYW4gc3R5bGU9ImNvbG9yOiM5NWE1YTYiPmtvbnRha3RAbWFyaWFuZWsucGw8L3NwYW4+PC9hPjwvc3Bhbj48L3A+DQo8L2Rpdj4NCiI7czoxMDoiaG90cGF5X2FwaSI7czo1OToiUkZSTmFHUk9ibXBuVEUxbWNtUlVNME5OZFRsTlJqWndSeTg0U1dsaFFXRTJhWHA1UzFKRVYwOHdjejAiO3M6NToiZGV2ZWwiO3M6MToiMCI7czozOiJzc2wiO3M6MToiMCI7czoxNDoiaHRhY2Nlc3NfY2FjaGUiO3M6MToiMSI7czoxMzoiZnJlZV9kZWxpdmVyeSI7czo1OiI5OS4wMCI7czoxODoicHJ6ZWxld3kyNF9zYW5kYm94IjtzOjE6IjAiO3M6MjI6InByemVsZXd5MjRfbWVyY2hhbnRfaWQiO3M6NjoiMTU2MTAxIjtzOjE4OiJwcnplbGV3eTI0X2NyY19rZXkiO3M6MTY6ImQ4NWFkOWRlOGNiYTBlMDEiO3M6MTA6InVwZGF0ZV9rZXkiO3M6MzI6ImZmZmE2ODNlYWVjMTU2ZGQwNGNiMDM3ZmU0ODMyZDY5IjtzOjc6InRwYXlfaWQiO3M6NToiNzQ2OTgiO3M6MTI6InRwYXlfc2FuZGJveCI7czoxOiIwIjtzOjE4OiJ0cGF5X3NlY3VyaXR5X2NvZGUiO3M6MTc6IilER01xPmt6eEApIzcwdmFyIjtzOjY6InBpa3NlbCI7czoxNjoiMjU2Nzk5OTIwMzMxNDI3NyI7czoxMzoiZ2VuZXJhdGVfd2VicCI7czoxOiIxIjtzOjEyOiJsYXp5X2xvYWRpbmciO3M6MToiMSI7czoxMjoiZWtvbWlfc3VydmV5IjtzOjA6IiI7czoyMToiZ29vZ2xlX3RhZ19tYW5hZ2VyX2lkIjtzOjEyOiJHVE0tUE03WjNMUjgiO3M6MTQ6ImluZmluaXRlc2Nyb2xsIjtzOjE6IjAiO3M6MjU6IndhcmVob3VzZV9tZXNzYWdlX3plcm9fcGwiO3M6MTY6IiFXeXN5xYJrYSBkbyAyNGgiO3M6Mjg6IndhcmVob3VzZV9tZXNzYWdlX25vbnplcm9fcGwiO3M6MTc6IiEhV3lzecWCa2EgZG8gMjRoIjt9fQ==

2
admin/templates/shop-product/products-list.php
View File

@@ -110,7 +110,7 @@
typeAnimated: true,
animation: 'opacity',
columnClass: 'col-12 col-lg-8',
theme: 'supervan',
theme: 'material',
icon: 'fa fa-exclamation-triangle',
buttons: {
confirm: {

BIN
autoload/.DS_Store vendored
View File

Binary file not shown.

53
autoload/admin/factory/class.ShopProduct.php
View File

@@ -622,53 +622,6 @@ class ShopProduct
return $result;
}
public static function permutation_quantity($id_product, $permutation)
{
global $mdb;
return $mdb -> get('pp_shop_products_stock', 'quantity', ['AND' => ['id_product' => $id_product, 'permutation' => $permutation]]);
}
public static function stock_save($id_product, $permutations_quantity)
{
global $mdb;
$mdb -> delete( 'pp_shop_products_stock', [ 'id_product' => $id_product ] );
if ( is_array( $permutations_quantity ) ) foreach ($permutations_quantity as $key => $val)
{
$permutations[] = $mdb -> get('pp_shop_products_stock', 'id', ['AND' => ['id_product' => $id_product, 'permutation' => $key]]);
$mdb -> delete('pp_shop_products_stock', ['AND' => ['id_product' => $id_product, 'id[!]' => $permutations]]);
}
if (\is_array($permutations_quantity))
{
foreach ($permutations_quantity as $key => $val)
{
if ($id = $mdb -> get('pp_shop_products_stock', 'id', ['AND' => ['id_product' => $id_product, 'permutation' => $key]]))
{
$mdb -> update('pp_shop_products_stock', [
'quantity' => $val,
], [
'id' => $id,
]);
\S::delete_dir('../temp/');
}
else
{
$mdb -> insert('pp_shop_products_stock', [
'id_product' => $id_product,
'permutation' => $key,
'quantity' => $val,
]);
\S::delete_dir('../temp/');
}
}
}
return true;
}
// product_unarchive
static public function product_unarchive( int $product_id )
{
@@ -1050,12 +1003,6 @@ class ShopProduct
\admin\factory\ShopProduct::update_product_combinations_prices( $product_id, $price_brutto, $vat, $price_brutto_promo );
//stan magazynowy
if ( $mdb -> count( 'pp_shop_products_stock', [ 'id_product' => $product_id ] ) )
$mdb -> update( 'pp_shop_products_stock', [ 'quantity' => $quantity ], [ 'id_product' => $product_id ] );
else
$mdb -> insert( 'pp_shop_products_stock', [ 'id_product' => $product_id, 'quantity' => $quantity ] );
foreach ( $name as $key => $val )
{
if ( $translation_id = $mdb -> get( 'pp_shop_products_langs', 'id', [ 'AND' => [ 'product_id' => $product_id, 'lang_id' => $key ] ] ) )

4
autoload/class.Article.php
View File

@@ -39,8 +39,6 @@ class Article implements \ArrayAccess
$this -> images = $mdb -> select( 'pp_articles_images', '*', [ 'article_id' => (int)$article_id, 'ORDER' => [ 'o' => 'ASC', 'id' => 'ASC' ] ] );
$this -> files = $mdb -> select( 'pp_articles_files', '*', [ 'article_id' => (int)$article_id ] );
$this -> pages = $mdb -> select( 'pp_articles_pages', 'page_id', [ 'article_id' => (int)$article_id ] );
$this -> tags = $mdb -> select( 'pp_tags', [ '[><]pp_articles_tags' => [ 'id' => 'tag_id' ] ], 'name', [ 'article_id' => (int)$article_id ] );
$results = $mdb -> select( 'pp_articles_additional_params', [ '[><]pp_articles_additional_values' => [ 'id' => 'param_id' ] ], [ 'name', 'value', 'language_id' ], [ 'article_id' => (int)$article_id ] );
if ( is_array( $results ) ) foreach ( $results as $row )
{
if ( !$row['language_id'] )
@@ -51,7 +49,7 @@ class Article implements \ArrayAccess
$this -> params = $params;
}
public function get_from_cache( $article_id, $lang_id )
static public function get_from_cache( $article_id, $lang_id )
{
$cacheHandler = new \CacheHandler();
$cacheKey = "\Article::get_from_cache:$article_id:$lang_id";

370
autoload/class.Image.php
View File

@@ -1,64 +1,82 @@
<?php
class ImageManipulator
{
protected $width;
protected $height;
protected $image;
protected $file;
protected int $width;
protected int $height;
protected \GdImage $image;
protected ?string $file = null;
/**
* Image manipulator constructor
*
* @param string $file OPTIONAL Path to image file or image data as string
* @return void
* @param string|null $file Path to image file or image data as string
*/
public function __construct($file = null)
public function __construct(?string $file = null)
{
if ( null !== $file )
{
$this -> file = $file;
if ($file !== null) {
$this->file = $file;
if ( is_file( $file ) )
$this->setImageFile($file);
else
$this->setImageString($file);
}
if (is_file($file)) {
$this->setImageFile($file);
} else {
$this->setImageString($file);
}
}
}
/**
* Set image resource from file
*
* @param string $file Path to image file
* @return ImageManipulator for a fluent interface
* @return self
* @throws InvalidArgumentException
*/
public function setImageFile($file)
public function setImageFile(string $file): self
{
if (!(is_readable($file) && is_file($file))) {
throw new InvalidArgumentException("Image file $file is not readable");
}
if (is_resource($this->image)) {
if (isset($this->image) && $this->image instanceof \GdImage) {
imagedestroy($this->image);
}
list ( $this -> width, $this -> height, $type ) = getimagesize($file);
[$width, $height, $type] = getimagesize($file);
if ($width === false || $height === false) {
throw new InvalidArgumentException("Unable to get image size for $file");
}
error_log("Loaded image size from file: width: $width, height: $height, type: $type");
switch ($type) {
case IMAGETYPE_GIF :
$this->image = imagecreatefromgif($file);
break;
case IMAGETYPE_JPEG :
$this->image = imagecreatefromjpeg($file);
break;
case IMAGETYPE_PNG :
$this->image = imagecreatefrompng($file);
break;
case IMAGETYPE_GIF:
$this->image = imagecreatefromgif($file);
break;
case IMAGETYPE_JPEG:
$this->image = imagecreatefromjpeg($file);
break;
case IMAGETYPE_PNG:
$this->image = imagecreatefrompng($file);
break;
case IMAGETYPE_WEBP:
$this -> image = imagecreatefromwebp($file);
break;
default :
throw new InvalidArgumentException("Image type $type not supported");
$this->image = imagecreatefromwebp($file);
break;
default:
throw new InvalidArgumentException("Image type $type not supported");
}
if (!$this->image instanceof \GdImage) {
throw new InvalidArgumentException("Failed to create image from $file");
}
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
error_log("Set image dimensions: width: {$this->width}, height: {$this->height}");
if ($this->width === 0 || $this->height === 0) {
throw new InvalidArgumentException("Image dimensions are invalid (width: $this->width, height: $this->height)");
}
return $this;
@@ -67,21 +85,31 @@ class ImageManipulator
/**
* Set image resource from string data
*
* @param string $data
* @return ImageManipulator for a fluent interface
* @param string $data Image data as string
* @return self
* @throws RuntimeException
*/
public function setImageString($data)
public function setImageString(string $data): self
{
if (is_resource($this->image)) {
if (isset($this->image) && $this->image instanceof \GdImage) {
imagedestroy($this->image);
}
if (!$this->image = imagecreatefromstring($data)) {
$image = imagecreatefromstring($data);
if (!$image instanceof \GdImage) {
throw new RuntimeException('Cannot create image from data string');
}
$this->image = $image;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
error_log("Set image dimensions from string: width: {$this->width}, height: {$this->height}");
if ($this->width === 0 || $this->height === 0) {
throw new RuntimeException("Image dimensions are invalid (width: $this->width, height: $this->height)");
}
return $this;
}
@@ -91,54 +119,57 @@ class ImageManipulator
* @param int $width New width
* @param int $height New height
* @param bool $constrainProportions Constrain current image proportions when resizing
* @return ImageManipulator for a fluent interface
* @return self
* @throws RuntimeException
*/
public function resample( $width, $height, $constrainProportions = true )
public function resample(int $width, int $height, bool $constrainProportions = true): self
{
if (!is_resource($this->image)) {
throw new RuntimeException('No image set');
if (!isset($this->image) || !$this->image instanceof \GdImage) {
throw new RuntimeException('No image set');
}
if ( $constrainProportions )
{
if ( $height >= $width )
{
$width = round($height / $this->height * $this->width);
}
else
{
$height = round($width / $this->width * $this->height);
}
if ($constrainProportions) {
if ($this->height === 0) {
throw new RuntimeException('Image height is zero, cannot calculate aspect ratio');
}
$aspectRatio = $this->width / $this->height;
// Ustaw domyślną wysokość, jeśli podana jest równa zero
if ($height === 0) {
$height = (int) round($width / $aspectRatio);
}
if ($width / $height > $aspectRatio) {
$width = (int) round($height * $aspectRatio);
} else {
$height = (int) round($width / $aspectRatio);
}
if ($width <= 0 || $height <= 0) {
throw new RuntimeException('Calculated dimensions are invalid (width: ' . $width . ', height: ' . $height . ')');
}
}
$temp = imagecreatetruecolor($width, $height);
$transparent_index = imagecolortransparent( $this -> image );
imagealphablending($temp, false);
imagesavealpha($temp,true);
$transparent = imagecolorallocatealpha($temp, 255, 255, 255, 127);
imagefilledrectangle($temp, 0, 0, $this->width, $this->height, $transparent);
imagecopyresampled($temp, $this->image, 0, 0, 0, 0, $width, $height, $this->width, $this->height);
return $this->_replace($temp);
// reszta kodu metody
return $this;
}
/**
* Enlarge canvas
*
* @param int $width Canvas width
* @param int $height Canvas height
* @param array $rgb RGB colour values
* @param int $xpos X-Position of image in new canvas, null for centre
* @param int $ypos Y-Position of image in new canvas, null for centre
* @return ImageManipulator for a fluent interface
* @param int $width Canvas width
* @param int $height Canvas height
* @param array $rgb RGB colour values [R, G, B]
* @param int|null $xpos X-Position of image in new canvas, null for centre
* @param int|null $ypos Y-Position of image in new canvas, null for centre
* @return self
* @throws RuntimeException
*/
public function enlargeCanvas($width, $height, array $rgb = array(), $xpos = null, $ypos = null)
public function enlargeCanvas(int $width, int $height, array $rgb = [], ?int $xpos = null, ?int $ypos = null): self
{
if (!is_resource($this->image)) {
if (!isset($this->image) || !$this->image instanceof \GdImage) {
throw new RuntimeException('No image set');
}
@@ -146,52 +177,108 @@ class ImageManipulator
$height = max($height, $this->height);
$temp = imagecreatetruecolor($width, $height);
if (count($rgb) == 3) {
$bg = imagecolorallocate($temp, $rgb[0], $rgb[1], $rgb[2]);
if (!$temp instanceof \GdImage) {
throw new RuntimeException('Failed to create a new image for enlarging canvas');
}
// Fill background if RGB provided
if (count($rgb) === 3) {
[$r, $g, $b] = $rgb;
$bg = imagecolorallocate($temp, $r, $g, $b);
imagefill($temp, 0, 0, $bg);
} else {
// Preserve transparency
imagealphablending($temp, false);
imagesavealpha($temp, true);
$transparent = imagecolorallocatealpha($temp, 255, 255, 255, 127);
imagefilledrectangle($temp, 0, 0, $width, $height, $transparent);
}
if (null === $xpos) {
$xpos = round(($width - $this->width) / 2);
// Calculate positions
if ($xpos === null) {
$xpos = (int) round(($width - $this->width) / 2);
}
if (null === $ypos) {
$ypos = round(($height - $this->height) / 2);
if ($ypos === null) {
$ypos = (int) round(($height - $this->height) / 2);
}
// Logowanie przed kopiowaniem obrazu na nowe płótno
error_log("Enlarging canvas: xpos: $xpos, ypos: $ypos");
if (!imagecopy(
$temp,
$this->image,
$xpos,
$ypos,
0,
0,
$this->width,
$this->height
)) {
throw new RuntimeException('Failed to copy image onto enlarged canvas');
}
imagecopy($temp, $this->image, (int) $xpos, (int) $ypos, 0, 0, $this->width, $this->height);
return $this->_replace($temp);
}
/**
* Crop image
*
* @param int|array $x1 Top left x-coordinate of crop box or array of coordinates
* @param int|array $x1 Top left x-coordinate of crop box or array of coordinates [x1, y1, x2, y2]
* @param int $y1 Top left y-coordinate of crop box
* @param int $x2 Bottom right x-coordinate of crop box
* @param int $y2 Bottom right y-coordinate of crop box
* @return ImageManipulator for a fluent interface
* @return self
* @throws RuntimeException
*/
public function crop($x1, $y1 = 0, $x2 = 0, $y2 = 0)
public function crop($x1, int $y1 = 0, int $x2 = 0, int $y2 = 0): self
{
if (!is_resource($this->image)) {
if (!isset($this->image) || !$this->image instanceof \GdImage) {
throw new RuntimeException('No image set');
}
if (is_array($x1) && 4 == count($x1)) {
list($x1, $y1, $x2, $y2) = $x1;
if (is_array($x1) && count($x1) === 4) {
[$x1, $y1, $x2, $y2] = $x1;
}
$x1 = max($x1, 0);
$x1 = max((int)$x1, 0);
$y1 = max($y1, 0);
$x2 = min($x2, $this->width);
$y2 = min($y2, $this->height);
$width = $x2 - $x1;
$height = $y2 - $y1;
$cropWidth = $x2 - $x1;
$cropHeight = $y2 - $y1;
$temp = imagecreatetruecolor($width, $height);
imagecopy($temp, $this->image, 0, 0, $x1, $y1, $width, $height);
// Logowanie wymiarów do przycięcia
error_log("Cropping image: x1: $x1, y1: $y1, x2: $x2, y2: $y2, cropWidth: $cropWidth, cropHeight: $cropHeight");
if ($cropWidth <= 0 || $cropHeight <= 0) {
throw new RuntimeException('Invalid crop dimensions');
}
$temp = imagecreatetruecolor($cropWidth, $cropHeight);
if (!$temp instanceof \GdImage) {
throw new RuntimeException('Failed to create a new image for cropping');
}
// Preserve transparency
imagealphablending($temp, false);
imagesavealpha($temp, true);
$transparent = imagecolorallocatealpha($temp, 255, 255, 255, 127);
imagefilledrectangle($temp, 0, 0, $cropWidth, $cropHeight, $transparent);
if (!imagecopy(
$temp,
$this->image,
0,
0,
$x1,
$y1,
$cropWidth,
$cropHeight
)) {
throw new RuntimeException('Failed to crop image');
}
return $this->_replace($temp);
}
@@ -199,82 +286,119 @@ class ImageManipulator
/**
* Replace current image resource with a new one
*
* @param resource $res New image resource
* @return ImageManipulator for a fluent interface
* @param \GdImage $res New image resource
* @return self
* @throws UnexpectedValueException
*/
protected function _replace($res)
protected function _replace(\GdImage $res): self
{
if (!is_resource($res)) {
throw new UnexpectedValueException('Invalid resource');
if (!$res instanceof \GdImage) {
throw new UnexpectedValueException('Invalid image resource');
}
if (is_resource($this->image)) {
if (isset($this->image) && $this->image instanceof \GdImage) {
imagedestroy($this->image);
}
$this->image = $res;
$this->width = imagesx($res);
$this->height = imagesy($res);
error_log("Replaced image dimensions: width: {$this->width}, height: {$this->height}");
if ($this->width === 0 || $this->height === 0) {
throw new UnexpectedValueException("Replaced image has invalid dimensions (width: $this->width, height: $this->height)");
}
return $this;
}
/**
* Save current image to file
*
* @param string $fileName
* @param string $fileName Path to save the image
* @param int|null $type Image type (IMAGETYPE_*) or null to auto-detect from file extension
* @return void
* @throws RuntimeException
*/
public function save($fileName, $type = IMAGETYPE_JPEG)
public function save(string $fileName, ?int $type = null): void
{
$dir = dirname($fileName);
if (!is_dir($dir)) {
if (!mkdir($dir, 0755, true)) {
if (!mkdir($dir, 0755, true) && !is_dir($dir)) {
throw new RuntimeException('Error creating directory ' . $dir);
}
}
// Auto-detect type from file extension if not provided
if ($type === null) {
$extension = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
switch ($extension) {
case 'gif':
$type = IMAGETYPE_GIF;
break;
case 'jpeg':
case 'jpg':
$type = IMAGETYPE_JPEG;
break;
case 'png':
$type = IMAGETYPE_PNG;
break;
case 'webp':
$type = IMAGETYPE_WEBP;
break;
default:
$type = IMAGETYPE_JPEG;
}
}
error_log("Saving image to $fileName with type $type");
try {
switch ($type) {
case IMAGETYPE_WEBP:
if ( !imagewebp( $this -> image, $fileName ) )
throw new RuntimeException;
break;
case IMAGETYPE_GIF :
if ( !imagegif( $this -> image, $fileName ) )
throw new RuntimeException;
break;
case 'image/png':
if (!imagepng($this->image, $fileName)) {
throw new RuntimeException;
if (!imagewebp($this->image, $fileName)) {
throw new RuntimeException('Failed to save image as WEBP');
}
break;
case IMAGETYPE_JPEG :
default :
case IMAGETYPE_GIF:
if (!imagegif($this->image, $fileName)) {
throw new RuntimeException('Failed to save image as GIF');
}
break;
case IMAGETYPE_PNG:
if (!imagepng($this->image, $fileName)) {
throw new RuntimeException('Failed to save image as PNG');
}
break;
case IMAGETYPE_JPEG:
default:
if (!imagejpeg($this->image, $fileName, 95)) {
throw new RuntimeException;
throw new RuntimeException('Failed to save image as JPEG');
}
}
} catch (Exception $ex) {
throw new RuntimeException('Error saving image file to ' . $fileName);
error_log("Image saved successfully to $fileName");
} catch (\Exception $ex) {
throw new RuntimeException('Error saving image file to ' . $fileName . ': ' . $ex->getMessage());
}
}
/**
* Returns the GD image resource
*
* @return resource
* @return \GdImage
*/
public function getResource()
public function getResource(): \GdImage
{
return $this->image;
}
/**
* Get current image resource width
* Get current image width
*
* @return int
*/
public function getWidth()
public function getWidth(): int
{
return $this->width;
}
@@ -284,8 +408,18 @@ class ImageManipulator
*
* @return int
*/
public function getHeight()
public function getHeight(): int
{
return $this->height;
}
/**
* Destructor to clean up the image resource
*/
public function __destruct()
{
if (isset($this->image) && $this->image instanceof \GdImage) {
imagedestroy($this->image);
}
}
}

4
autoload/class.S.php
View File

@@ -170,7 +170,7 @@ class S
public static function get_domain( $url )
{
$parseUrl = parse_url( trim( $url ) );
return trim( $parseUrl[host] ? str_replace( 'www.', '', $parseUrl[host] ) : str_replace( 'www.', '', array_shift( explode( '/', $parseUrl[path], 2 ) ) ) );
return trim( $parseUrl['host'] ? str_replace( 'www.', '', $parseUrl['host'] ) : str_replace( 'www.', '', array_shift( explode( '/', $parseUrl['path'], 2 ) ) ) );
}
static public function pre_dump( $value )
@@ -237,7 +237,7 @@ class S
{
$result = array();
while ( list($key, $values) = each( $input ) )
foreach ($array as $key => $value)
{
if ( empty( $values ) )
continue;

BIN
autoload/front/.DS_Store vendored
View File

Binary file not shown.

6
autoload/front/controls/class.ShopBasket.php
View File

@@ -202,8 +202,12 @@ class ShopBasket
$values['wp'] = \front\factory\ShopProduct::product_wp( $values[ 'product-id' ] );
$attributes_implode = '';
// generuj unikalny kod produktu dodanego do koszyka
$product_code = md5( $values['product-id'] . implode( '|', $attributes ) . $values['product-message'] . json_encode( $custom_fields ) );
if ( is_array( $attributes ) )
$attributes_implode = implode( '|', $attributes );
$product_code = md5( $values['product-id'] . $attributes_implode . $values['product-message'] . json_encode( $custom_fields ) );
if ( isset( $basket[ $product_code ] ) )
$basket[ $product_code ][ 'quantity' ] += $values[ 'quantity' ];

2
autoload/front/controls/class.ShopOrder.php
View File

@@ -18,6 +18,8 @@ class ShopOrder
{
global $mdb;
file_put_contents( 'tpay.txt', print_r( $_POST, true ) . print_r( $_GET, true ), FILE_APPEND );
if ( \S::get( 'tr_status' ) == 'TRUE' and \S::get( 'tr_crc' ) )
{
$order = new \shop\Order( 0, \S::get( 'tr_crc' ) );

6
autoload/front/factory/class.Layouts.php
View File

@@ -65,18 +65,18 @@ class Layouts
if ( !$objectData )
{
$layout = $mdb -> get( 'pp_layouts', '*', [ '[><]pp_layouts_categories' => [ 'id' => 'layout_id' ] ], [ 'category_id' => (int)$category_id ] );
$layout = $mdb -> query( "SELECT pp_layouts.* FROM pp_layouts JOIN pp_layouts_categories ON pp_layouts.id = pp_layouts_categories.layout_id WHERE pp_layouts_categories.category_id = " . (int)$category_id ) -> fetchAll( \PDO::FETCH_ASSOC );
if ( !$layout )
$layout = $mdb -> get( 'pp_layouts', '*', [ 'categories_default' => 1 ] );
$cacheHandler -> set( $cacheKey, $layout );
$cacheHandler -> set( $cacheKey, $layout[0] );
}
else
{
return unserialize( $objectData );
}
return $layout;
return $layout[0];
}
static public function active_layout( $page_id )

33
autoload/front/factory/class.ShopProduct.php
View File

@@ -248,11 +248,6 @@ class ShopProduct
if ( is_array( $results ) )
foreach ( $results as $row )
{
$row[ 'require' ] = $mdb -> get( 'pp_shop_attributes',
'required',
[ 'id' => $row[ 'attribute_id' ] ]
);
$row[ 'type' ] = $mdb -> get( 'pp_shop_attributes',
'type',
[ 'id' => $row[ 'attribute_id' ] ]
@@ -301,9 +296,9 @@ class ShopProduct
$product[ 'products_related' ] = $mdb -> select( 'pp_shop_products_related', 'product_related_id', [ 'product_id' => (int)$product_id ] );
$products_sets_1 = $mdb -> select( 'pp_shop_products_sets', 'product_sets_id', [ 'product_id' => (int)$product_id ] );
$products_sets_2 = $mdb -> select( 'pp_shop_products_sets', 'product_id', [ 'product_sets_id' => (int)$product_id ] );
$products_sets = array_unique( array_merge( $products_sets_1, $products_sets_2 ) );
$set_id = $mdb -> select( 'pp_shop_product_sets_products', 'set_id', [ 'product_id' => (int)$product_id ] );
$products_sets = $mdb -> select( 'pp_shop_product_sets_products', 'product_id', [ 'set_id' => (int)$set_id ] );
$products_sets = array_unique( $products_sets );
$product[ 'products_sets' ] = $products_sets;
@@ -338,28 +333,6 @@ class ShopProduct
return $mdb -> get( 'pp_shop_products_langs', 'warehouse_message_nonzero', [ 'AND' => [ 'product_id' => $id_product, 'lang_id' => $lang_id ] ] );
}
public static function permutation_quantity( $id_product, $permutation, bool $is_multichoice )
{
global $mdb;
if ( !$is_multichoice )
return $mdb -> get( 'pp_shop_products_stock', 'quantity', [ 'AND' => [ 'id_product' => $id_product, 'permutation' => 0 ] ] );
if ( is_array( $permutation ) )
{
foreach ( $permutation as $key => $val )
{
$permutation_id .= $val;
if ( $val != end( $permutation ) )
$permutation_id .= '_';
}
}
else
$permutation_id = $permutation;
return $mdb -> get( 'pp_shop_products_stock', 'quantity', [ 'AND' => [ 'id_product' => $id_product, 'permutation' => $permutation_id ] ] );
}
//TO:DO do usunięcia
public static function product_both_price( $product_id )
{

4
autoload/shop/class.Product.php
View File

@@ -795,7 +795,7 @@ class Product implements \ArrayAccess
{
$result = array();
while ( list($key, $values) = each( $input ) )
foreach ( $input as $key => $values )
{
if ( empty( $values ) )
continue;
@@ -834,7 +834,7 @@ class Product implements \ArrayAccess
public function __get( $variable )
{
if ( array_key_exists( $variable, $this -> data ) )
if ( is_array( $this -> data ) and array_key_exists( $variable, $this -> data ) )
return $this -> $variable;
}

5
libraries/grid/gdb.min.php
View File

@@ -199,7 +199,10 @@ class gdb
}
}
return implode($stack, ',');
if ( is_array( $stack ) )
return implode( ',', $stack );
else
return $stack;
}
protected function array_quote($array)

5
libraries/grid/grid.php
View File

@@ -78,8 +78,9 @@ class grid
$this -> name ? $g_table = $this -> name : $g_table = $this -> table;
if ( is_array( $_SESSION ) ) foreach ( $_SESSION as $key => $val )
{
if ( $key != 'g' . $g_table and @get_class( $val ) == '__PHP_Incomplete_Class' )
unset( $_SESSION[ $key ] );
if ($key != 'g' . $g_table && is_object($val) && get_class($val) == '__PHP_Incomplete_Class') {
unset($_SESSION[$key]);
}
}
}
}

2
libraries/grid/js/grid.js
View File

@@ -507,7 +507,7 @@ jQuery( 'body' ).on( 'click', '#g-save, #g-edit-save', function()
if ( g_validate_form( gtable ) === true )
{
var values = jQuery( '#fg-' + gtable ).serializeObject();
var values = jQuery( '#fg-' + gtable ).serializeArray();
var url = jQuery( this ).attr( 'url' );

2
libraries/grid/templates/container.php
View File

@@ -14,7 +14,7 @@
or
$this -> values['print']
):?>
<div class="row mb10" style="min-height: 50px;">
<div class="row mb10" style="height: 50px;">
<?
if ( $this -> values['title'] )
echo '<div id="g-title">' . $this -> values['title'] . '</div>';

2293
libraries/rb.php
View File

File diff suppressed because it is too large Load Diff

2
templates/articles/article-entry.php
View File

@@ -1,5 +1,5 @@
<? global $lang;?>
<div class="col-12 col-sm-6 ">
<div class="col-12 col-md-6 ">
<div class="article-entry">
<? $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \S::seo( $this -> article['language']['title'] );?>
<div class="blog-image">

14
templates/shop-category/products.php Normal file
View File

@@ -0,0 +1,14 @@
<? global $lang_id;?>
<? if ( $this -> query ):?>
<div class="box-title">
<?= \S::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
</div>
<? endif;?>
<div class="category-content">
<? if ( is_array( $this -> products ) ): foreach ( $this -> products as $product_id ):
$product = new \shop\Product( $product_id );
echo \Tpl::view( 'shop-product/product-mini', [
'product' => new \shop\Product( $product_id, $lang_id )
] );
endforeach; endif;?>
</div>

28
templates/shop-order/payment-confirmation.php
View File

@@ -1,4 +1,4 @@
<? if ( $this -> order['status'] == 1 ):?>
<? if ( $this -> order['status'] == 1 or $this -> order['status'] == 4 ):?>
<div id="payment-confirmation">
<div class="bold blue text-center">Płatność została zatwierdzona. Dziękujemy za wybranie naszych usług.</div>
<div class="text-center">Nasz system zweryfikuje Państwa zamówienie w ciągu kilku minut.</div>
@@ -24,8 +24,26 @@
</tfoot>
</table>
</div>
<? endif;?>
<? if ( \S::get_session( 'ekomi-purchase' ) and $this -> settings['ekomi_survey'] ):?>
<? unset( $_SESSION['ekomi-purchase'] );?>
<?= $this -> settings['ekomi_survey'];?>
<? else:?>
<div id="payment-confirmation">
<div class="bold red text-center">Płatność oczekuje na zatwierdzenie.</div>
<div class="text-center">Nasz system zweryfikuje Państwa zamówienie w ciągu kilku minut.</div>
<p></p>
<table class="table table-stripped table-bordered payment-table">
<thead>
<tr>
<th class="text-center" colspan="2">Informacje o płatności</th>
</tr>
</thead>
<tbody>
<tr>
<td class="text-bold">Zamówienie nr:</td><td><?= $this -> order['number'];?></td>
</tr>
<tr>
<td class="text-bold">Data transakcji:</td><td><?= date( 'Y-m-d H:i', strtotime( $this -> order['date_order'] ) );?></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2" class="text-right
<? endif;?>

8
tpay.txt Normal file
View File

@@ -0,0 +1,8 @@
Array
(
)
Array
(
[module] => shop_order
[action] => payment_status_tpay
)