diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index 1304c4226654..fdace861b768 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -249,6 +249,26 @@ class InvoiceApiController extends BaseAPIController return $item; } + public function emailInvoicev2() + { + $data = Input::all(); + $error = null; + + $invoice = Invoice::scope($data['id'])->firstOrFail(); + + $this->mailer->sendInvoice($invoice); + + if($error) { + $response['error'] = "There was an error sending the invoice"; + } + else { + $response = json_encode(RESULT_SUCCESS, JSON_PRETTY_PRINT); + } + + $headers = Utils::getApiHeaders(); + return Response::make($response, $error ? 400 : 200, $headers); + } + public function emailInvoice() { $data = Input::all(); diff --git a/app/Http/Controllers/ProductApiController.php b/app/Http/Controllers/ProductApiController.php new file mode 100644 index 000000000000..7aef42393b8d --- /dev/null +++ b/app/Http/Controllers/ProductApiController.php @@ -0,0 +1,88 @@ +productService = $productService; + } + + public function index() + { + + $products = Product::scope()->withTrashed(); + $products = $products->paginate(); + + $paginator = Product::scope()->withTrashed()->paginate(); + + $transformer = new ProductTransformer(\Auth::user()->account, $this->serializer); + $data = $this->createCollection($products, $transformer, 'products', $paginator); + + return $this->response($data); + + } + + public function getDatatable() + { + return $this->productService->getDatatable(Auth::user()->account_id); + } + + public function store() + { + return $this->save(); + } + + public function update($publicId) + { + return $this->save($publicId); + } + + public function destroy($publicId) + { + //stub + } + + private function save($productPublicId = false) + { + if ($productPublicId) { + $product = Product::scope($productPublicId)->firstOrFail(); + } else { + $product = Product::createNew(); + } + + $product->product_key = trim(Input::get('product_key')); + $product->notes = trim(Input::get('notes')); + $product->cost = trim(Input::get('cost')); + //$product->default_tax_rate_id = Input::get('default_tax_rate_id'); + + $product->save(); + + $transformer = new ProductTransformer(\Auth::user()->account, Input::get('serializer')); + $data = $this->createItem($product, $transformer, 'products'); + + return $this->response($data); + + } + + +} diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index b0f44b79a076..15eeb65c7a8a 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -7,6 +7,7 @@ class VerifyCsrfToken extends BaseVerifier { private $openRoutes = [ 'signup/register', + 'api/v1/*', 'api/v1/login', 'api/v1/clients/*', 'api/v1/clients', diff --git a/app/Http/routes.php b/app/Http/routes.php index 5d3748153a57..3582c1c83936 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -230,7 +230,9 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function() Route::resource('tasks', 'TaskApiController'); Route::post('hooks', 'IntegrationController@subscribe'); Route::post('email_invoice', 'InvoiceApiController@emailInvoice'); + Route::post('email_invoicev2', 'InvoiceApiController@emailInvoicev2'); Route::get('user_accounts','AccountApiController@getUserAccounts'); + Route::resource('products', 'ProductApiController'); // Vendor Route::resource('vendors', 'VendorApiController');