maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

changed google sync credentials to app - new config uses constants

Browse source
This commit is contained in:
Alex Tselegidis 2015-04-13 20:01:00 +02:00
parent 6838a06f51
commit cfa9891c64
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/application/config/config.php
View file

@ -16,7 +16,7 @@ $config['easyappointments'] = array(
$config['ea_version'] = '1.1.0'; // This must be changed manually.
$config['ea_release_title'] = 'Develop'; // Leave empty for no title or add BETA, TEST etc ...
$config['ea_google_sync_feature'] = Config::$google_sync_feature;
$config['ea_google_sync_feature'] = Config::GOOGLE_SYNC_FEATURE;
/*

8
src/application/libraries/google_sync.php
View file

@ -33,10 +33,10 @@ class Google_Sync {
$this->client = new Google_Client();
$this->client->setUseObjects(true);
$this->client->setApplicationName(Config::$google_product_name);
$this->client->setClientId(Config::$google_client_id);
$this->client->setClientSecret(Config::$google_client_secret);
$this->client->setDeveloperKey(Config::$google_api_key);
$this->client->setApplicationName(Config::GOOGLE_PRODUCT_NAME);
$this->client->setClientId(Config::GOOGLE_CLIENT_ID);
$this->client->setClientSecret(Config::GOOGLE_CLIENT_SECRET);
$this->client->setDeveloperKey(Config::GOOGLE_API_KEY);
$this->client->setRedirectUri($this->CI->config->item('base_url') . '/google/oauth_callback');
$this->service = new Google_CalendarService($this->client);

4
src/application/views/appointments/book_success.php
View file

@ -55,8 +55,8 @@
'providerData' : <?php echo json_encode($provider_data); ?>,
'serviceData' : <?php echo json_encode($service_data); ?>,
'companyName' : <?php echo '"' . $company_name . '"'; ?>,
'googleApiKey' : <?php echo '"' . Config::$google_api_key . '"'; ?>,
'googleClientId' : <?php echo '"' . Config::$google_client_id . '"'; ?>,
'googleApiKey' : <?php echo '"' . Config::GOOGLE_API_KEY . '"'; ?>,
'googleClientId' : <?php echo '"' . Config::GOOGLE_CLIENT_ID . '"'; ?>,
'googleApiScope' : 'https://www.googleapis.com/auth/calendar'
};

15
src/application/views/emails/appointment_details.php
View file

@ -5,9 +5,9 @@
<body style="font: 13px arial, helvetica, tahoma;">
<div class="email-container" style="width: 650px;border: 1px solid #eee;">
<div id="header" style="background-color: #3DD481; border-bottom: 4px solid #1A865F;
height: 40px;padding: 10px 15px;">
<strong id="logo" style="color: white; font-size: 24px;
text-shadow: 1px 1px 1px #8F8888; margin-top: 5px; display: inline-block">
height: 45px;padding: 10px 15px;">
<strong id="logo" style="color: white; font-size: 20px;
text-shadow: 1px 1px 1px #8F8888; margin-top: 10px; display: inline-block">
$company_name</strong>
</div>
@ -59,9 +59,12 @@
<a href="$appointment_link" style="width: 600px;">$appointment_link</a>
</div>
<div id="footer" style="padding: 10px; text-align: center;
border-top: 1px solid #EEE;background: #FAFAFA;">
<a href="$company_link">$company_name</a> | Powered by Easy!Appointments
<div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
border-top: 1px solid #EEE; background: #FAFAFA;">
Powered by
<a href="http://easyappointments.org" style="text-decoration: none;">Easy!Appointments</a>
|
<a href="$company_link" style="text-decoration: none;">$company_name</a>
</div>
</div>
</body>