Skip to content

Commit 499127c

Browse files
author
Shaun Kutch
committed
Added Mailchimp field back
Removed demo site case updated some styles
1 parent 28ddf3d commit 499127c

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

‎application/controllers/config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function save()
4646
$batch_save_data['mc_api_key'] = $validated_api_key;
4747
}
4848

49-
if($_SERVER['HTTP_HOST'] !='demo.phppointofsale.com' && $this->Appconfig->batch_save($batch_save_data))
49+
if($this->Appconfig->batch_save($batch_save_data))
5050
{
5151
echo json_encode(array('success'=>true,'message'=>$this->lang->line('config_saved_successfully')));
5252
}

‎application/views/config.php‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ul id="error_message_box"></ul>
66

77
<div class="form-group">
8-
<?php echo form_label($this->lang->line('config_company').':', 'company',array('class'=>'wide required')); ?>
8+
<?php echo form_label($this->lang->line('config_company'), 'company',array('class'=>'wide required')); ?>
99

1010
<?php echo form_input(array(
1111
'class'=>'form-control',
@@ -15,7 +15,7 @@
1515
</div>
1616

1717
<div class="form-group">
18-
<?php echo form_label($this->lang->line('config_address').':', 'address',array('class'=>'wide required')); ?>
18+
<?php echo form_label($this->lang->line('config_address'), 'address',array('class'=>'wide required')); ?>
1919

2020
<?php echo form_textarea(array(
2121
'class'=>'form-control',
@@ -27,7 +27,7 @@
2727
</div>
2828

2929
<div class="form-group">
30-
<?php echo form_label($this->lang->line('config_phone').':', 'phone',array('class'=>'wide required')); ?>
30+
<?php echo form_label($this->lang->line('config_phone'), 'phone',array('class'=>'wide required')); ?>
3131

3232
<?php echo form_input(array(
3333
'class'=>'form-control',
@@ -37,7 +37,7 @@
3737
</div>
3838

3939
<div class="form-group">
40-
<?php echo form_label($this->lang->line('config_default_tax_rate_1').':', 'default_tax_1_rate',array('class'=>'wide required')); ?>
40+
<?php echo form_label($this->lang->line('config_default_tax_rate_1'), 'default_tax_1_rate',array('class'=>'wide required')); ?>
4141
<div class="row">
4242
<div class="col-lg-6">
4343
<?php echo form_input(array(
@@ -63,7 +63,7 @@
6363
</div>
6464

6565
<div class="form-group">
66-
<?php echo form_label($this->lang->line('config_default_tax_rate_2').':', 'default_tax_1_rate',array('class'=>'wide')); ?>
66+
<?php echo form_label($this->lang->line('config_default_tax_rate_2'), 'default_tax_1_rate',array('class'=>'wide')); ?>
6767
<div class="row">
6868
<div class="col-lg-6">
6969
<?php echo form_input(array(
@@ -89,7 +89,7 @@
8989
</div>
9090

9191
<div class="form-group">
92-
<?php echo form_label($this->lang->line('common_email').':', 'email',array('class'=>'wide')); ?>
92+
<?php echo form_label($this->lang->line('common_email'), 'email',array('class'=>'wide')); ?>
9393

9494
<?php echo form_input(array(
9595
'class'=>'form-control',
@@ -100,7 +100,7 @@
100100

101101

102102
<div class="form-group">
103-
<?php echo form_label($this->lang->line('config_fax').':', 'fax',array('class'=>'wide')); ?>
103+
<?php echo form_label($this->lang->line('config_fax'), 'fax',array('class'=>'wide')); ?>
104104

105105
<?php echo form_input(array(
106106
'class'=>'form-control',
@@ -110,7 +110,7 @@
110110
</div>
111111

112112
<div class="form-group">
113-
<?php echo form_label($this->lang->line('config_website').':', 'website',array('class'=>'wide')); ?>
113+
<?php echo form_label($this->lang->line('config_website'), 'website',array('class'=>'wide')); ?>
114114

115115
<?php echo form_input(array(
116116
'class'=>'form-control',
@@ -119,8 +119,17 @@
119119
'value'=>$this->config->item('website')));?>
120120
</div>
121121

122+
<div class="form-group">
123+
<?php echo form_label($this->lang->line('config_mc_api_key'), 'mc_api_key', array('class'=>'wide')); ?>
124+
<?php echo form_input(array(
125+
'class'=>'form-control',
126+
'name'=>'mc_api_key',
127+
'id'=>'mc_api_key',
128+
'value'=>$this->config->item('mc_api_key')));?>
129+
</div>
130+
122131
<div class="form-group">
123-
<?php echo form_label($this->lang->line('common_return_policy').':', 'return_policy',array('class'=>'wide required')); ?>
132+
<?php echo form_label($this->lang->line('common_return_policy'), 'return_policy',array('class'=>'wide required')); ?>
124133

125134
<?php echo form_textarea(array(
126135
'class'=>'form-control',
@@ -132,7 +141,7 @@
132141
</div>
133142

134143
<div class="form-group">
135-
<?php echo form_label($this->lang->line('config_language').':', 'language',array('class'=>'wide required')); ?>
144+
<?php echo form_label($this->lang->line('config_language'), 'language',array('class'=>'wide required')); ?>
136145

137146
<?php echo form_dropdown('language', array(
138147
'english' => 'English',
@@ -142,7 +151,7 @@
142151
</div>
143152

144153
<div class="form-group">
145-
<?php echo form_label($this->lang->line('config_timezone').':', 'timezone',array('class'=>'wide required')); ?>
154+
<?php echo form_label($this->lang->line('config_timezone'), 'timezone',array('class'=>'wide required')); ?>
146155

147156
<?php echo form_dropdown('timezone',
148157
array(
@@ -241,7 +250,7 @@
241250
</div>
242251

243252
<div class="form-group">
244-
<?php echo form_label($this->lang->line('config_print_after_sale').':', 'print_after_sale',array('class'=>'wide')); ?>
253+
<?php echo form_label($this->lang->line('config_print_after_sale'), 'print_after_sale',array('class'=>'wide')); ?>
245254

246255
<?php echo form_checkbox(array(
247256
'name'=>'print_after_sale',
@@ -250,7 +259,6 @@
250259
'checked'=>$this->config->item('print_after_sale')));?>
251260
</div>
252261

253-
254262
<?php
255263
echo form_submit(array(
256264
'name'=>'submit',

0 commit comments

Comments
 (0)