Enabled creating invoices through the API

This commit is contained in:
Hillel Coren 2015-02-27 10:10:23 +02:00
parent 854f6777ab
commit b165f47763
10 changed files with 246 additions and 68 deletions

View File

@ -20,10 +20,6 @@ class ClientApiController extends Controller
public function index() public function index()
{ {
if (!Utils::isPro()) {
return Redirect::to('/');
}
$clients = Client::scope()->with('contacts')->orderBy('created_at', 'desc')->get(); $clients = Client::scope()->with('contacts')->orderBy('created_at', 'desc')->get();
$clients = Utils::remapPublicIds($clients->toArray()); $clients = Utils::remapPublicIds($clients->toArray());
@ -35,10 +31,6 @@ class ClientApiController extends Controller
public function store() public function store()
{ {
if (!Utils::isPro()) {
return Redirect::to('/');
}
$data = Input::all(); $data = Input::all();
$error = $this->clientRepo->getErrors($data); $error = $this->clientRepo->getErrors($data);

View File

@ -1,22 +1,20 @@
<?php <?php
use ninja\repositories\InvoiceRepository; use ninja\repositories\InvoiceRepository;
use ninja\mailers\ContactMailer as Mailer;
class InvoiceApiController extends Controller class InvoiceApiController extends Controller
{ {
protected $invoiceRepo; protected $invoiceRepo;
public function __construct(InvoiceRepository $invoiceRepo) public function __construct(InvoiceRepository $invoiceRepo, Mailer $mailer)
{ {
$this->invoiceRepo = $invoiceRepo; $this->invoiceRepo = $invoiceRepo;
$this->mailer = $mailer;
} }
public function index() public function index()
{ {
if (!Utils::isPro()) {
return Redirect::to('/');
}
$invoices = Invoice::scope()->where('invoices.is_quote', '=', false)->orderBy('created_at', 'desc')->get(); $invoices = Invoice::scope()->where('invoices.is_quote', '=', false)->orderBy('created_at', 'desc')->get();
$invoices = Utils::remapPublicIds($invoices->toArray()); $invoices = Utils::remapPublicIds($invoices->toArray());
@ -26,20 +24,168 @@ class InvoiceApiController extends Controller
return Response::make($response, 200, $headers); return Response::make($response, 200, $headers);
} }
/*
public function store() public function store()
{ {
if (!Utils::isPro()) { $data = Input::all();
return Redirect::to('/'); $error = null;
// check if the invoice number is set and unique
if (!isset($data['invoice_number'])) {
$data['invoice_number'] = Auth::user()->account->getNextInvoiceNumber();
} else {
$invoice = Invoice::scope()->where('invoice_number', '=', $data['invoice_number'])->first();
if ($invoice) {
$error = trans('validation.unique', ['attribute' => 'texts.invoice_number']);
}
} }
$data = Input::all(); // check the client id is set and exists
if (!isset($data['client_id'])) {
$error = trans('validation.required', ['attribute' => 'client_id']);
} else {
$client = Client::scope($data['client_id'])->first();
if (!$client) {
$error = trans('validation.not_in', ['attribute' => 'client_id']);
}
}
if ($error) {
$response = json_encode($error, JSON_PRETTY_PRINT);
} else {
$data = self::prepareData($data);
$invoice = $this->invoiceRepo->save(false, $data, false); $invoice = $this->invoiceRepo->save(false, $data, false);
$invitation = Invitation::createNew();
$invitation->invoice_id = $invoice->id;
$invitation->contact_id = $client->contacts[0]->id;
$invitation->invitation_key = str_random(RANDOM_KEY_LENGTH);
$invitation->save();
// prepare the return data
$invoice->load('invoice_items');
$invoice = $invoice->toArray();
$invoice['link'] = $invitation->getLink();
unset($invoice['account']);
unset($invoice['client']);
$invoice = Utils::remapPublicIds($invoice);
$invoice['client_id'] = $client->public_id;
$response = json_encode($invoice, JSON_PRETTY_PRINT); $response = json_encode($invoice, JSON_PRETTY_PRINT);
}
$headers = Utils::getApiHeaders(); $headers = Utils::getApiHeaders();
return Response::make($response, 200, $headers); return Response::make($response, $error ? 400 : 200, $headers);
}
private function prepareData($data)
{
$account = Auth::user()->account;
$account->loadLocalizationSettings();
// set defaults for optional fields
$fields = [
'discount' => 0,
'is_amount_discount' => false,
'terms' => $account->invoice_terms,
'public_notes' => '',
'po_number' => '',
'invoice_design_id' => $account->invoice_design_id,
'invoice_items' => [],
'custom_value1' => 0,
'custom_value2' => 0,
'custom_taxes1' => false,
'custom_taxes2' => false,
];
if (!isset($data['invoice_date'])) {
$fields['invoice_date_sql'] = date_create()->format('Y-m-d');
}
if (!isset($data['due_date'])) {
$fields['due_date_sql'] = false;
}
foreach ($fields as $key => $val) {
if (!isset($data[$key])) {
$data[$key] = $val;
}
}
// hardcode some fields
$fields = [
'is_recurring' => false
];
foreach ($fields as $key => $val) {
$data[$key] = $val;
}
// initialize the line items
if (isset($data['product_key']) || isset($data['cost']) || isset($data['notes']) || isset($data['qty'])) {
$data['invoice_items'] = [self::prepareItem($data)];
} else {
foreach ($data['invoice_items'] as $index => $item) {
$data['invoice_items'][$index] = self::prepareItem($item);
}
}
return $data;
}
private function prepareItem($item)
{
$fields = [
'cost' => 0,
'product_key' => '',
'notes' => '',
'qty' => 1
];
foreach ($fields as $key => $val) {
if (!isset($item[$key])) {
$item[$key] = $val;
}
}
// if only the product key is set we'll load the cost and notes
if ($item['product_key'] && (!$item['cost'] || !$item['notes'])) {
$product = Product::findProductByKey($item['product_key']);
if ($product) {
if (!$item['cost']) {
$item['cost'] = $product->cost;
}
if (!$item['notes']) {
$item['notes'] = $product->notes;
}
}
}
return $item;
}
public function emailInvoice()
{
$data = Input::all();
$error = null;
if (!isset($data['id'])) {
$error = trans('validation.required', ['attribute' => 'id']);
} else {
$invoice = Invoice::scope($data['id'])->first();
if (!$invoice) {
$error = trans('validation.not_in', ['attribute' => 'id']);
} else {
$this->mailer->sendInvoice($invoice);
}
}
if ($error) {
$response = json_encode($error, JSON_PRETTY_PRINT);
} else {
$response = json_encode(RESULT_SUCCESS, JSON_PRETTY_PRINT);
}
$headers = Utils::getApiHeaders();
return Response::make($response, $error ? 400 : 200, $headers);
} }
*/
} }

View File

@ -13,10 +13,6 @@ class PaymentApiController extends Controller
public function index() public function index()
{ {
if (!Utils::isPro()) {
return Redirect::to('/');
}
$payments = Payment::scope()->orderBy('created_at', 'desc')->get(); $payments = Payment::scope()->orderBy('created_at', 'desc')->get();
$payments = Utils::remapPublicIds($payments->toArray()); $payments = Utils::remapPublicIds($payments->toArray());

View File

@ -13,10 +13,6 @@ class QuoteApiController extends Controller
public function index() public function index()
{ {
if (!Utils::isPro()) {
return Redirect::to('/');
}
$invoices = Invoice::scope()->where('invoices.is_quote', '=', true)->orderBy('created_at', 'desc')->get(); $invoices = Invoice::scope()->where('invoices.is_quote', '=', true)->orderBy('created_at', 'desc')->get();
$invoices = Utils::remapPublicIds($invoices->toArray()); $invoices = Utils::remapPublicIds($invoices->toArray());

View File

@ -173,6 +173,47 @@ Route::filter('auth.basic', function()
return Auth::basic(); return Auth::basic();
}); });
Route::filter('api.access', function()
{
$headers = Utils::getApiHeaders();
if (!Utils::isPro()) {
return Response::make('API requires pro plan', 403, $headers);
} else {
$accountId = Auth::user()->account->id;
// http://stackoverflow.com/questions/1375501/how-do-i-throttle-my-sites-api-users
$hour = 60 * 60;
$hour_limit = 100; # users are limited to 100 requests/hour
$hour_throttle = Cache::get("hour_throttle:{$accountId}", null);
$last_api_request = Cache::get("last_api_request:{$accountId}", 0);
$last_api_diff = time() - $last_api_request;
if (is_null($hour_throttle)) {
$new_hour_throttle = 0;
} else {
$new_hour_throttle = $hour_throttle - $last_api_diff;
$new_hour_throttle = $new_hour_throttle < 0 ? 0 : $new_hour_throttle;
$new_hour_throttle += $hour / $hour_limit;
$hour_hits_remaining = floor(( $hour - $new_hour_throttle ) * $hour_limit / $hour);
$hour_hits_remaining = $hour_hits_remaining >= 0 ? $hour_hits_remaining : 0;
}
if ($new_hour_throttle > $hour) {
$wait = ceil($new_hour_throttle - $hour);
sleep(1);
return Response::make("Please wait {$wait} second(s)", 403, $headers);
}
Cache::put("hour_throttle:{$accountId}", $new_hour_throttle, 10);
Cache::put("last_api_request:{$accountId}", time(), 10);
}
return null;
});
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Guest Filter | Guest Filter

View File

@ -539,23 +539,26 @@ class utils
} }
} }
public static function remapPublicIds($data)
public static function remapPublicIds(array $data)
{ {
foreach ($data as $index => $record) { $return = [];
if (!isset($data[$index]['public_id'])) {
foreach ($data as $key => $val) {
if ($key === 'public_id') {
$key = 'id';
} elseif (strpos($key, '_id')) {
continue; continue;
} }
$data[$index]['id'] = $data[$index]['public_id'];
unset($data[$index]['public_id']);
foreach ($record as $key => $val) {
if (is_array($val)) { if (is_array($val)) {
$data[$index][$key] = Utils::remapPublicIds($val); $val = Utils::remapPublicIds($val);
}
}
} }
return $data; $return[$key] = $val;
}
return $return;
} }
public static function getApiHeaders($count = 0) public static function getApiHeaders($count = 0)

View File

@ -226,7 +226,7 @@ class InvoiceRepository
$invoice->is_amount_discount = $data['is_amount_discount'] ? true : false; $invoice->is_amount_discount = $data['is_amount_discount'] ? true : false;
$invoice->invoice_number = trim($data['invoice_number']); $invoice->invoice_number = trim($data['invoice_number']);
$invoice->is_recurring = $data['is_recurring'] && !Utils::isDemo() ? true : false; $invoice->is_recurring = $data['is_recurring'] && !Utils::isDemo() ? true : false;
$invoice->invoice_date = Utils::toSqlDate($data['invoice_date']); $invoice->invoice_date = isset($data['invoice_date_sql']) ? $data['invoice_date_sql'] : Utils::toSqlDate($data['invoice_date']);
if ($invoice->is_recurring) { if ($invoice->is_recurring) {
$invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0; $invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0;
@ -234,7 +234,7 @@ class InvoiceRepository
$invoice->end_date = Utils::toSqlDate($data['end_date']); $invoice->end_date = Utils::toSqlDate($data['end_date']);
$invoice->due_date = null; $invoice->due_date = null;
} else { } else {
$invoice->due_date = Utils::toSqlDate($data['due_date']); $invoice->due_date = isset($data['due_date_sql']) ? $data['due_date_sql'] : Utils::toSqlDate($data['due_date']);
$invoice->frequency_id = 0; $invoice->frequency_id = 0;
$invoice->start_date = null; $invoice->start_date = null;
$invoice->end_date = null; $invoice->end_date = null;
@ -256,16 +256,17 @@ class InvoiceRepository
$total = 0; $total = 0;
foreach ($data['invoice_items'] as $item) { foreach ($data['invoice_items'] as $item) {
if (!$item->cost && !$item->product_key && !$item->notes) { $item = (array) $item;
if (!$item['cost'] && !$item['product_key'] && !$item['notes']) {
continue; continue;
} }
$invoiceItemCost = Utils::parseFloat($item->cost); $invoiceItemCost = Utils::parseFloat($item['cost']);
$invoiceItemQty = Utils::parseFloat($item->qty); $invoiceItemQty = Utils::parseFloat($item['qty']);
$invoiceItemTaxRate = 0; $invoiceItemTaxRate = 0;
if (isset($item->tax_rate) && Utils::parseFloat($item->tax_rate) > 0) { if (isset($item['tax_rate']) && Utils::parseFloat($item['tax_rate']) > 0) {
$invoiceItemTaxRate = Utils::parseFloat($item->tax_rate); $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate']);
} }
$lineTotal = $invoiceItemCost * $invoiceItemQty; $lineTotal = $invoiceItemCost * $invoiceItemQty;
@ -314,25 +315,27 @@ class InvoiceRepository
$invoice->amount = $total; $invoice->amount = $total;
$invoice->save(); $invoice->save();
if ($publicId) {
$invoice->invoice_items()->forceDelete(); $invoice->invoice_items()->forceDelete();
}
foreach ($data['invoice_items'] as $item) { foreach ($data['invoice_items'] as $item) {
if (!$item->cost && !$item->product_key && !$item->notes) { $item = (array) $item;
if (!$item['cost'] && !$item['product_key'] && !$item['notes']) {
continue; continue;
} }
if ($item->product_key) { if ($item['product_key']) {
$product = Product::findProductByKey(trim($item->product_key)); $product = Product::findProductByKey(trim($item['product_key']));
if (!$product) { if (!$product) {
$product = Product::createNew(); $product = Product::createNew();
$product->product_key = trim($item->product_key); $product->product_key = trim($item['product_key']);
} }
if (\Auth::user()->account->update_products) { if (\Auth::user()->account->update_products) {
$product->notes = $item->notes; $product->notes = $item['notes'];
$product->cost = $item->cost; $product->cost = $item['cost'];
//$product->qty = $item->qty;
} }
$product->save(); $product->save();
@ -340,21 +343,21 @@ class InvoiceRepository
$invoiceItem = InvoiceItem::createNew(); $invoiceItem = InvoiceItem::createNew();
$invoiceItem->product_id = isset($product) ? $product->id : null; $invoiceItem->product_id = isset($product) ? $product->id : null;
$invoiceItem->product_key = trim($invoice->is_recurring ? $item->product_key : Utils::processVariables($item->product_key)); $invoiceItem->product_key = trim($invoice->is_recurring ? $item->product_key : Utils::processVariables($item['product_key']));
$invoiceItem->notes = trim($invoice->is_recurring ? $item->notes : Utils::processVariables($item->notes)); $invoiceItem->notes = trim($invoice->is_recurring ? $item['notes'] : Utils::processVariables($item['notes']));
$invoiceItem->cost = Utils::parseFloat($item->cost); $invoiceItem->cost = Utils::parseFloat($item['cost']);
$invoiceItem->qty = Utils::parseFloat($item->qty); $invoiceItem->qty = Utils::parseFloat($item['qty']);
$invoiceItem->tax_rate = 0; $invoiceItem->tax_rate = 0;
if (isset($item->tax_rate) && isset($item->tax_name) && $item->tax_name) { if (isset($item['tax_rate']) && isset($item['tax_name']) && $item['tax_name']) {
$invoiceItem->tax_rate = Utils::parseFloat($item->tax_rate); $invoiceItem['tax_rate'] = Utils::parseFloat($item['tax_rate']);
$invoiceItem->tax_name = trim($item->tax_name); $invoiceItem['tax_name'] = trim($item['tax_name']);
} }
$invoice->invoice_items()->save($invoiceItem); $invoice->invoice_items()->save($invoiceItem);
} }
if ($data['set_default_terms']) { if (isset($data['set_default_terms']) && $data['set_default_terms']) {
$account = \Auth::user()->account; $account = \Auth::user()->account;
$account->invoice_terms = $invoice->terms; $account->invoice_terms = $invoice->terms;
$account->save(); $account->save();

View File

@ -142,7 +142,7 @@ Route::group(array('before' => 'auth'), function() {
}); });
// Route group for API // Route group for API
Route::group(array('prefix' => 'api/v1', 'before' => 'auth.basic'), function() Route::group(array('prefix' => 'api/v1', 'before' => ['auth.basic', 'api.access']), function()
{ {
Route::resource('ping', 'ClientApiController@ping'); Route::resource('ping', 'ClientApiController@ping');
Route::resource('clients', 'ClientApiController'); Route::resource('clients', 'ClientApiController');
@ -150,6 +150,7 @@ Route::group(array('prefix' => 'api/v1', 'before' => 'auth.basic'), function()
Route::resource('quotes', 'QuoteApiController'); Route::resource('quotes', 'QuoteApiController');
Route::resource('payments', 'PaymentApiController'); Route::resource('payments', 'PaymentApiController');
Route::post('api/hooks', 'IntegrationController@subscribe'); Route::post('api/hooks', 'IntegrationController@subscribe');
Route::post('email_invoice', 'InvoiceApiController@emailInvoice');
}); });
define('CONTACT_EMAIL', Config::get('mail.from.address')); define('CONTACT_EMAIL', Config::get('mail.from.address'));