diff --git a/custom/pages/termsandconditions.php b/custom/pages/termsandconditions.php
index ee331b4..97c59de 100644
--- a/custom/pages/termsandconditions.php
+++ b/custom/pages/termsandconditions.php
@@ -6,7 +6,7 @@ if (isset($_GET['download'])){
generatedPDF($termsandconditions_items,$terms_text);
}
?>
-=template_header($terms_text)?>
+=template_header($terms_text,'')?>
diff --git a/custom/settings/config.php b/custom/settings/config.php
index 5afe5e3..028181c 100644
--- a/custom/settings/config.php
+++ b/custom/settings/config.php
@@ -15,8 +15,6 @@ define('language_code','US');
define('age_verification_enabled',false);
//Enable VeLiTi-analytics
define('veliti_analytics',false);
-// Default logtraffic
-define('log_usage',false);
/* Banners */
// Show offer at home page
@@ -43,17 +41,17 @@ define('emaillogo','custom/assets/MORVALFavicon.svg');
/* Detailed settings */
// Homepage highlightedproducts
-define('category_id_highlighted_products_1','6');
+define('category_id_highlighted_products_1','21');
// Homepage highlightedproducts
-define('category_id_highlighted_products_2','7');
+define('category_id_highlighted_products_2','22');
//Show small images from configuration
define('show_option_images',false);
// Default category_id for suggestions
-define('category_id_checkout_suggestions','7');
+define('category_id_checkout_suggestions','');
// Default category_id for giftcard
define('giftcard_id','');
// Default category_id for samples
-define('category_id_checkout_samples','7');
+define('category_id_checkout_samples','');
// Default samples
define('sample_pricing_override',false);
// Default samples
@@ -71,7 +69,7 @@ define('default_product_sort','sort3');
// Enable automatice invoice forward to bookkeeping software
define('invoice_bookkeeping',false);
// Email of bookkeeping software
-define('email_bookkeeping','');
+define('email_bookkeeping','morval-wat-d24506a2@facturen.moneybird.nl');
// Rewrite URL?
define('rewrite_url',true);
@@ -80,7 +78,7 @@ define('rewrite_url',true);
define('featured_image','custom/assets/morval_header_2.jpg');
define('featured_store_image','custom/assets/morval_collection2.png');
// Featured image ABOUT US
-define('featured_about_image','custom/assets/morval_about_morval.png');
+define('featured_about_image','custom/assets/morval_about_us_2.jpg');
// Featured image ABOUT MORVAL
define('featured_about_morval_image','custom/assets/morval_about_us.png');
// Featured image order notification
@@ -106,7 +104,7 @@ define('banner_background','custom/assets/morval_banner.jpg');
/* Links */
//Link to product catalog
-define('link_to_collection','index.php?page=products&category=2');
+define('link_to_collection','index.php?page=products&category=17');
define('link_to_external_product_site','');
define('privacy_link','/custom/assets/2024_Morval_Privacy_Statement.pdf');
define('termsandconditions_link','/custom/assets/2024_Morval_Terms_and_conditions.pdf');
@@ -116,33 +114,30 @@ define('instagram_link','https://www.instagram.com/morvalwatches?igsh=azZ5NTN0M2
/* Owner */
// City displayed in footer
-define('company_name','');
-define('company_adres','');
-define('company_postal','');
-define('company_bank','');
-define('company_kvk','');
+define('company_name','MorvalWatches');
+define('company_adres','Kasteellaan 2');
+define('company_postal','5492 BR');
+define('company_bank','IBAN NL67 KNAB 0608 6634 17');
+define('company_kvk','89442679');
-define('footer_city','');
-// Country displayed in Footer
-define('footer_country','');
-// Phone number in Footer
-define('footer_phone','');
-// Phone number in Footer
-define('footer_email','');
+define('footer_city','St Oedenrode');
+define('footer_country','Netherlands');
+define('footer_phone','Tel: +31 639725831');
+define('footer_email','info@morvalwatches.com');
/* Email */
// The from email that will appear on the customer's order details email
-define('mail_from','Name');
+define('mail_from','MorvalWatches');
// Send mail to the customers, etc?
define('mail_enabled',true);
// Your email
-define('email','info@gewoonlekkerspaans.nl');
+define('email','info@morvalwatches.com');
// Receive email notifications?
-define('email_notifications',false);
+define('email_notifications',true);
//Additional phpmailer-settings
-define('email_host_name','gewoonlekkerspaans.nl');
-define('email_reply_to','info@gewoonlekkerspaans.nl');
-define('email_outgoing_pw','o7f4t3E*5');
+define('email_host_name','morvalwatches.com');
+define('email_reply_to','info@morvalwatches.com');
+define('email_outgoing_pw','MWTH#2024');
define('email_outgoing_port','465');
define('email_outgoing_security','ssl');
@@ -155,6 +150,7 @@ define('db_user','morvalwatches');//morvalwatches_prod
define('db_pass','4~gv71bM6');
// Database name
define('db_name','shoppingcart_advanced'); //morvalwatches
+
/* API */
define('clientID','MorvalWatches'); //morvalwatches
define('clientsecret','MW2024!'); //morvalwatches
@@ -163,24 +159,24 @@ define('img_url','https://dev.veliti.nl/');
/* Payment options */
//Pay on Delivery
-define('pay_on_delivery_enabled',true);
-define('pay_on_delivery_default',true);
+define('pay_on_delivery_enabled',false);
+define('pay_on_delivery_default',false);
// Mollie
-define('mollie_enabled',false);
+define('mollie_enabled',true);
define('mollie_default',false);
-define('mollie_api_key','');
+define('mollie_api_key','test_TBJPkq6E3Tn6kuCjqQFv9PBGu52Ac8'); //live_m2mbPTnvVzF4tUu25mtHja6D8vHkfM
// Accept payments with PayPal?
-define('paypal_enabled',false);
-define('paypal_default',false);
-define('PAYPAL_URL','');
-define('PAYPAL_WEBHOOK','');
-define('PAYPAL_CLIENT_ID','');
-define('PAYPAL_CLIENT_SECRET','');
+define('paypal_enabled',true);
+define('paypal_default',true);
+define('PAYPAL_URL','https://api-m.paypal.com');
+define('PAYPAL_WEBHOOK','https://www.morvalwatches.com/webhook_paypal.php');
+define('PAYPAL_CLIENT_ID','Afty4hhP24gHyVDXGIh1gMNlBZRZd6H2JB4V9fxYs7sS2IdZWa_I0B5mLxCMcwdp1pNIa_cEiXYPB5PO');
+define('PAYPAL_CLIENT_SECRET','ELNREN5q16u0vU1Bt4D-VUwHFlom1duM4sYVfpdmwXLgX9NFOnefQ4EHl-ILQnR4lVd1_ukd267ZAMcf');
/* Admin modes */
//debug
-define('debug',true);
+define('debug',false);
// Default maintenance_mode
define('maintenanceMode',false);
?>
\ No newline at end of file
diff --git a/custom/settings/settings.php b/custom/settings/settings.php
new file mode 100644
index 0000000..44c8c31
--- /dev/null
+++ b/custom/settings/settings.php
@@ -0,0 +1,13 @@
+ 'Austria',
+ 3 => 'Bulgaria',
+ 4 => 'Cyprus',
+ 21 => 'Netherlands',
+ 25 => 'Sweden',
+ 26 => 'Slovenia',
+ 27 => 'Slovakia (Slovak Republic)',
+);
+
+?>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 5f3f0c8..075c893 100644
--- a/functions.php
+++ b/functions.php
@@ -178,6 +178,7 @@ function template_admin_header($title, $selected = 'orders', $selected_child = '
$admin_links = '
Settings
@@ -597,109 +598,48 @@ function getPictureID($pdo,$id,$config){
//++++++++++++++++++++++++++++++++++++++++
//HomePage Products
//++++++++++++++++++++++++++++++++++++++++
-function highlightedProducts($clientsecret,$categoryID,$range){
+function highlightedProducts2($clientsecret,$categoryID,$range, $subtitle){
include './custom/translations/translations_'.strtoupper($_SESSION['country_code']).'.php';
-
+
//GET CATALOG DATA
$products = ioAPIv2('/v2/catalog/category='.$categoryID,'',$clientsecret);
$products = json_decode($products,true);
- $view = '
-
'.$range.'Limited edition
-
';
- foreach ($products as $product){
-
- // Ensure product price is a numeric value
- $product_price = isset($product['price']) && $product['price'] > 0 ? floatval($product['price']) : 0.00;
+ $section = '
+
+
+
+
+
';
- //SHOW LARGE PICTURE
- $view .= '
-
-
-
- ';
-
- //CHECK IF CONFIGURATION SETTING IS FOUND AND NOT EMPTY => USE GROUP TO DISPLAY IMAGES
- if (isset($product['configurations']) && isset($product['config_setting']) && $product['config_setting'] != ''){
-
-
- //GET THE CONFIG_SETTING GROuP AND DISPLAY
- foreach ($product['configurations'] as $config){
-
- //MATCH ASSIGNMENT WITH CONFIG SETTING
- if($config['assignment'] == $product['config_setting']){
-
- $view .= '
';
-
- //GET ALL RELATED ATTRIBUTES
- foreach ($config['attributes'] as $attribute){
- $option_id = $attribute['attribute_id']; // ID of the LARGE IMAGE
- $IMG_small_id = img_url.$attribute['full_path']; //URL TO SMALL IMAGE
- $IMG_large_id = img_url.$attribute['alternative_media_full_path']; //URL TO LARGE IMAGE
-
- // Ensure attribute price is a numeric value
- $attribute_price = isset($attribute['price']) ? floatval($attribute['price']) : 0.00;
-
- $option_price = isset($attribute['price'])
- // If price modifier is 1, add prices; otherwise, subtract
- ? ((isset($attribute['price_modifier']) && $attribute['price_modifier'] == 1) ? currency_code . number_format(floatval($product_price + $attribute_price), 2) : currency_code . number_format(floatval($product_price - $attribute_price), 2))
- // If product price is not zero, format it
- : (($product_price != 0.00) ? currency_code . number_format(floatval($product_price), 2) : '');
-
- $view .= '
-
-

-
';
- }
-
- $view .= '
';
-
- }
- }
-
- } else {
- //SHOW SMALL IMAGE
- $view .= '
-
-

-
-
';
- }
-
- //Stock status
- $stock_status = (isset($product['quantity']) && $product['quantity'] != 0) ? $product_on_stock : $out_of_stock;
- $style = ($stock_status == $product_on_stock) ? 'style="background-color: green;"' : 'style="background-color:gray;font-weight: lighter;"';
-
- $view .= '
-
- '.$stock_status.'
- ';
-
- if (free_shipment_indicator){
- $shipment = freeShipment($product_price,'span');
- $view .= $shipment;
- }
- $option_id ='';
- $view .='
- '.(${$product['productname']} ?? $product['productname']).'';
-
- if (isset($product_price)){
-
- $view .= ''.(($product_price != 0.00) ? currency_code.number_format($product_price,2) : '').'';
-
- if (isset($product['rrp']) && $product['rrp'] > 0){
- $view .= ''.currency_code.number_format($product['rrp'],2).'';
- }
- $view .= '';
- }
- $view .= '
-
-
';
+ foreach ($products as $product){
+
+ $product_price = isset($product['price']) && $product['price'] > 0 ? floatval($product['price']) : 0.00;
+
+ $section .= '
+
';
}
-
- $view .= '
';
- return $view;
+
+ $section .= '
+
+
+
+
+
+
+ ';
+
+ return $section ;
}
//---------------------------
diff --git a/home.php b/home.php
index ab8ba9f..1b35646 100644
--- a/home.php
+++ b/home.php
@@ -1,148 +1,124 @@
-'.template_menu().'
-
'.$h2_brand_name_1.'
-
-
'.$h2_brand_name_2.'
-
'.$h2_brand_visit.'
-
-