API tools faq
paste
Guest User

Untitled

a guest
Feb 19th, 2018
84
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.78 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/app/addons/product_variations/Tygh/Addons/ProductVariations/Product/AdditionalDataLoader.php b/app/addons/product_variations/Tygh/Addons/ProductVariations/Product/AdditionalDataLoader.php
  2. index c55e1627b5..b59555dbc2 100644
  3. --- a/app/addons/product_variations/Tygh/Addons/ProductVariations/Product/AdditionalDataLoader.php
  4. +++ b/app/addons/product_variations/Tygh/Addons/ProductVariations/Product/AdditionalDataLoader.php
  5. @@ -305,6 +305,14 @@ public function loadBaseData($product)
  6. $product['prices'][$key]['price'] = fn_apply_options_modifiers($selected_options, $item['price'], 'P', array(), array('product_data' => $product));
  7. }
  8. }
  9. +
  10. + if (!empty($product['selected_options'])) {
  11. + $product['options_combination'] = fn_get_options_combination($selected_options);
  12. + }
  13. +
  14. + if (!empty($product['changed_option'])) {
  15. + $product['options_changed'] = true;
  16. + }
  17. }
  18.  
  19. return $product;
  20. diff --git a/app/functions/fn.order_management.php b/app/functions/fn.order_management.php
  21. index 6e03ad67bb..2aa0641418 100644
  22. --- a/app/functions/fn.order_management.php
  23. +++ b/app/functions/fn.order_management.php
  24. @@ -54,7 +54,6 @@ function fn_get_data_of_changed_product(&$params, $auth, $mode)
  25. } else {
  26. $display_tpl = 'common/product_data.tpl';
  27. }
  28. -
  29. } else {
  30. $display_tpl = 'views/products/components/select_product_options.tpl';
  31.  
  32. diff --git a/design/themes/responsive/templates/addons/product_variations/blocks/products/variations_list.tpl b/design/themes/responsive/templates/addons/product_variations/blocks/products/variations_list.tpl
  33. index 14424ee754..ea50f7f6ab 100644
  34. --- a/design/themes/responsive/templates/addons/product_variations/blocks/products/variations_list.tpl
  35. +++ b/design/themes/responsive/templates/addons/product_variations/blocks/products/variations_list.tpl
  36. @@ -61,13 +61,14 @@
  37. </thead>
  38. <tbody>
  39. {foreach from=$products item="product" key="key" name="products"}
  40. + {$variation_link="products.view?product_id=`$product.product_id`&combination=`$product.options_combination`"|fn_url}
  41. {$obj_id=$product.product_id}
  42. {$obj_id_prefix="`$obj_prefix``$product.product_id`"}
  43. {include file="common/product_data.tpl" product=$product}
  44. {hook name="products:product_variations_list"}
  45. <tr class="ty-variations-list__item">
  46. <td class="ty-variations-list__product-elem ty-variations-list__image">
  47. - <a href="{"products.view?product_id=`$product.variation_product_id`"|fn_url}">
  48. + <a href="{$variation_link}">
  49. {include
  50. file="common/image.tpl"
  51. image_width=$image_width
  52. @@ -81,7 +82,7 @@
  53. {if $show_sku}
  54. <td class="ty-variations-list__product-elem ty-variations-list__product-elem-options ty-variations-list__sku">
  55. {$sku = "sku_`$obj_id`"}
  56. - <a href="{"products.view?product_id=`$product.variation_product_id`"|fn_url}">
  57. + <a href="{$variation_link}">
  58. {$smarty.capture.$sku nofilter}
  59. </a>
  60. </td>
  61. diff --git a/design/themes/responsive/templates/addons/product_variations/hooks/products/list_images_block.pre.tpl b/design/themes/responsive/templates/addons/product_variations/hooks/products/list_images_block.pre.tpl
  62. new file mode 100644
  63. index 0000000000..f7f04db010
  64. --- /dev/null
  65. +++ b/design/themes/responsive/templates/addons/product_variations/hooks/products/list_images_block.pre.tpl
  66. @@ -0,0 +1,6 @@
  67. +{if $product_link
  68. + && $product.options_changed
  69. + && $product.product_type === "\Tygh\Addons\ProductVariations\Product\Manager::PRODUCT_TYPE_CONFIGURABLE"|constant
  70. +}
  71. + {$product_link=fn_url("products.view?product_id=`$product.product_id`&combination=`$product.options_combination`") scope="parent"}
  72. +{/if}
  73. diff --git a/design/themes/responsive/templates/addons/product_variations/hooks/products/product_block_image.pre.tpl b/design/themes/responsive/templates/addons/product_variations/hooks/products/product_block_image.pre.tpl
  74. new file mode 100644
  75. index 0000000000..fb18338e38
  76. --- /dev/null
  77. +++ b/design/themes/responsive/templates/addons/product_variations/hooks/products/product_block_image.pre.tpl
  78. @@ -0,0 +1,6 @@
  79. +{if !$hide_links
  80. + && $product.options_changed
  81. + && $product.product_type === "\Tygh\Addons\ProductVariations\Product\Manager::PRODUCT_TYPE_CONFIGURABLE"|constant
  82. +}
  83. + {$product_link=fn_url("products.view?product_id=`$product.product_id`&combination=`$product.options_combination`") scope="parent"}
  84. +{/if}
  85. diff --git a/design/themes/responsive/templates/addons/product_variations/hooks/products/product_name.override.tpl b/design/themes/responsive/templates/addons/product_variations/hooks/products/product_name.override.tpl
  86. index 6d097094e2..a013c1b9c9 100644
  87. --- a/design/themes/responsive/templates/addons/product_variations/hooks/products/product_name.override.tpl
  88. +++ b/design/themes/responsive/templates/addons/product_variations/hooks/products/product_name.override.tpl
  89. @@ -1,11 +1,19 @@
  90. -{if $product.product_type === "\Tygh\Addons\ProductVariations\Product\Manager::PRODUCT_TYPE_CONFIGURABLE"|constant && $product.variation_product_id}
  91. +{if $product.product_type === "\Tygh\Addons\ProductVariations\Product\Manager::PRODUCT_TYPE_CONFIGURABLE"|constant}
  92. + {if !$hide_links}
  93. + {if $product.options_changed}
  94. + {$product_link=fn_url("products.view?product_id=`$product.product_id`&combination=`$product.options_combination`")}
  95. + {else}
  96. + {$product_link=fn_url("products.view?product_id=`$product.product_id`")}
  97. + {/if}
  98. + {/if}
  99. +
  100. <span class="cm-reload-{$obj_prefix}{$obj_id}" id="name_update_{$obj_prefix}{$obj_id}">
  101. {if $show_name}
  102. <input type="hidden" name="appearance[show_name]" value="{$show_name}" />
  103. - {if $hide_links}<strong>{else}<a href="{"products.view?product_id=`$product.variation_product_id`"|fn_url}" class="product-title" title="{$product.product|strip_tags}" {live_edit name="product:product:{$product.product_id}" phrase=$product.product}>{/if}{$product.product nofilter}{if $hide_links}</strong>{else}</a>{/if}
  104. + {if $hide_links}<strong>{else}<a href="{$product_link}" class="product-title" title="{$product.product|strip_tags}" {live_edit name="product:product:{$product.product_id}" phrase=$product.product}>{/if}{$product.product nofilter}{if $hide_links}</strong>{else}</a>{/if}
  105. {elseif $show_trunc_name}
  106. <input type="hidden" name="appearance[show_trunc_name]" value="{$show_trunc_name}" />
  107. - {if $hide_links}<strong>{else}<a href="{"products.view?product_id=`$product.variation_product_id`"|fn_url}" class="product-title" title="{$product.product|strip_tags}" {live_edit name="product:product:{$product.product_id}" phrase=$product.product}>{/if}{$product.product|truncate:44:"...":true nofilter}{if $hide_links}</strong>{else}</a>{/if}
  108. + {if $hide_links}<strong>{else}<a href="{$product_link}" class="product-title" title="{$product.product|strip_tags}" {live_edit name="product:product:{$product.product_id}" phrase=$product.product}>{/if}{$product.product|truncate:44:"...":true nofilter}{if $hide_links}</strong>{else}</a>{/if}
  109. {/if}
  110. <!--name_update_{$obj_prefix}{$obj_id}--></span>
  111. {/if}
  112. diff --git a/design/themes/responsive/templates/blocks/list_templates/products_list.tpl b/design/themes/responsive/templates/blocks/list_templates/products_list.tpl
  113. index 7d3c80b042..a225ae9527 100644
  114. --- a/design/themes/responsive/templates/blocks/list_templates/products_list.tpl
  115. +++ b/design/themes/responsive/templates/blocks/list_templates/products_list.tpl
  116. @@ -26,10 +26,11 @@
  117. {/if}
  118.  
  119. <div class="ty-product-list__image">
  120. + {assign var="product_link" value="products.view?product_id=`$product.product_id`"|fn_url}
  121. {hook name="products:product_block_image"}
  122. <span class="cm-reload-{$obj_prefix}{$obj_id} image-reload" id="list_image_update_{$obj_prefix}{$obj_id}">
  123. {if !$hide_links}
  124. - <a href="{"products.view?product_id=`$product.product_id`"|fn_url}">
  125. + <a href="{$product_link}">
  126. <input type="hidden" name="image[list_image_update_{$obj_prefix}{$obj_id}][link]" value="{"products.view?product_id=`$product.product_id`"|fn_url}" />
  127. {/if}
  128.  
  129. diff --git a/design/themes/responsive/templates/common/product_data.tpl b/design/themes/responsive/templates/common/product_data.tpl
  130. index 0bac2047bb..34a7a25870 100644
  131. --- a/design/themes/responsive/templates/common/product_data.tpl
  132. +++ b/design/themes/responsive/templates/common/product_data.tpl
  133. @@ -553,10 +553,11 @@
  134. {/if}
  135.  
  136. {foreach from=$images key="object_id" item="image"}
  137. +{assign var="product_link" value=$image.link}
  138. {hook name="products:list_images_block"}
  139. <div class="cm-reload-{$image.obj_id}" id="{$object_id}">
  140. - {if $image.link}
  141. - <a href="{$image.link}">
  142. + {if $product_link}
  143. + <a href="{$product_link}">
  144. <input type="hidden" value="{$image.link}" name="image[{$object_id}][link]" />
  145. {/if}
  146. <input type="hidden" value="{$image.obj_id},{$image.width},{$image.height},{$image.type}" name="image[{$object_id}][data]" />
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!