pcwvanbeers/Commerce
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
#Conflicts:
#	admin/countries.php
#	cart.php
#	custom/css/main.css
#	custom/customfunctions.php
#	custom/email/order-details-template.php
#	custom/email/order-invoice-template.php
#	custom/email/order-notification-template.php
#	custom/pages/about.php
#	custom/pages/about_morval.php
#	custom/settings/config.php
#	custom/settings/settings.php
#	functions.php
#	home.php
#	products.php
#	script.js
This commit is contained in:
“VeLiTi”
2025-08-12 15:46:06 +02:00
parent b9193fc3dc 60a32a7ff9
commit e4ddab934c
39 changed files with 13014 additions and 4983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
custom/settings/config.php
View File

@@ -5,12 +5,12 @@ define('security_key','MorvalWatches');
define('site_name','MorvalWatches');
// This will change the title on browser TAB
define('site_title','MorvalWatches');
// Currency code, default is USD, you can view the list here: http://cactus.io/resources/toolbox/html-currency-symbol-codes
// Currency code, default is USD
define('currency_code','€');
//Default Countrycode during checkout
define('country_default','');
define('country_default','nl');
//Default language for translations -> refers to include file translations_XX.php
define('language_code','US');
define('language_code','NL');
// Default age verification
define('age_verification_enabled',false);
//Enable VeLiTi-analytics
@@ -47,7 +47,11 @@ define('category_id_highlighted_products_2','22');
//Show small images from configuration
define('show_option_images',false);
// Default category_id for suggestions
<<<<<<< HEAD
define('category_id_checkout_suggestions','');
=======
define('category_id_checkout_suggestions','23');
>>>>>>> development
// Default category_id for giftcard
define('giftcard_id','');
// Default category_id for samples
@@ -66,10 +70,14 @@ define('default_payment_status','New');
define('account_required',false);
// Default product sort
define('default_product_sort','sort3');
<<<<<<< HEAD
// Enable automatice invoice forward to bookkeeping software
define('invoice_bookkeeping',false);
// Email of bookkeeping software
define('email_bookkeeping','morval-wat-d24506a2@facturen.moneybird.nl');
=======
>>>>>>> development
// Rewrite URL?
define('rewrite_url',true);
@@ -122,7 +130,11 @@ define('company_kvk','89442679');
define('footer_city','St Oedenrode');
define('footer_country','Netherlands');
<<<<<<< HEAD
define('footer_phone','Tel: +31 639725831');
=======
define('footer_phone','31639725831');
>>>>>>> development
define('footer_email','info@morvalwatches.com');
/* Email */
@@ -140,6 +152,10 @@ define('email_reply_to','info@morvalwatches.com');
define('email_outgoing_pw','MWTH#2024');
define('email_outgoing_port','465');
define('email_outgoing_security','ssl');
// Enable automatice invoice forward to bookkeeping software
define('invoice_bookkeeping',false);
// Email of bookkeeping software
define('email_bookkeeping','morval-wat-d24506a2@facturen.moneybird.nl');
/* Database */
// Database hostname, don't change this unless your hostname is different
@@ -154,8 +170,8 @@ define('db_name','shoppingcart_advanced'); //morvalwatches
/* API */
define('clientID','MorvalWatches'); //morvalwatches
define('clientsecret','MW2024!'); //morvalwatches
define('api_url','https://dev.veliti.nl/api.php'); //morvalwatches
define('img_url','https://dev.veliti.nl/');
define('api_url','https://cloud.soveliti.nl/api.php'); //morvalwatches
define('img_url','https://cloud.soveliti.nl');
/* Payment options */
//Pay on Delivery
@@ -163,12 +179,20 @@ define('pay_on_delivery_enabled',false);
define('pay_on_delivery_default',false);
// Mollie
define('mollie_enabled',true);
<<<<<<< HEAD
define('mollie_default',false);
=======
define('mollie_default',true);
>>>>>>> development
define('mollie_api_key','test_TBJPkq6E3Tn6kuCjqQFv9PBGu52Ac8'); //live_m2mbPTnvVzF4tUu25mtHja6D8vHkfM
// Accept payments with PayPal?
define('paypal_enabled',true);
<<<<<<< HEAD
define('paypal_default',true);
=======
define('paypal_default',false);
>>>>>>> development
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');