laravel-request 1.1.15 → 1.1.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "laravel-request",
   "productName": "laravel-request",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "laravel-request",
   "main": "src/index.js",
   "scripts": {},

package/readme.md

@@ -1,3 +1,12 @@
+Install
+
+npm install laravel-request
+
+Connected package
+
+https://github.com/olegstan/laravel-rest
+
+
 Usage get data
 
 ```
@@ -8,12 +17,32 @@ Api.get('active-trade', 'index')
       .with('from_account', 'from_account.currency')
       .orderBy('trade_at', 'DESC')
       .all((response) => {
-        
+        //success
+      }, () => {
+        //error
       })
-      .bind(this, 'trades')
 }}     
 ```
-    
+  
+or
+
+```
+Api.get('active-trade', 'index')
+      .where('id', 115)
+      .with('currency')
+      .with('to_account', 'to_account.currency')
+      .with('from_account', 'from_account.currency')
+      .orderBy('trade_at', 'DESC')
+      .first((response) => {
+        //success
+        
+      }, () => {
+        //error
+      })
+}}
+```
+
+  
 You can use
 
 all or first or paginate
@@ -31,4 +60,13 @@ Api.post('active', 'store', {
       }, (response) => {
         //error
       });
-```
+```
+
+response must be like below, for 200 status should contains key "result" with text "success"
+
+{
+    "meta": [],
+    "result": "success",
+    "data": [],
+}
+

package/src/Api.js

@@ -9,6 +9,11 @@ export default class Api {
    */
   static requestClass = ApiRequest;
 
+  static tokenResolver = () =>
+  {
+    return localStorage.getItem('api_token');
+  }
+
   /**
    *
    * @param controller
@@ -147,7 +152,7 @@ export default class Api {
     try {
       headers['Content-Type'] = 'application/json';
 
-      let api_token = localStorage.getItem('api_token');
+      let api_token = Api.tokenResolver();
       if (api_token)
       {
         headers["Authorization"] = api_token;

package/src/ApiRequest.js

@@ -146,6 +146,21 @@ export default class ApiRequest {
     return this.call(successCallback, errorCallback);
   }
 
+  /**
+   *
+   * @param fields
+   * @param successCallback
+   * @param errorCallback
+   * @return {ApiRequest}
+   */
+  pluck(fields, successCallback = (r) => {
+  }, errorCallback = () => {
+  }) {
+    this.data['paginateType'] = 'pluck';
+    this.data['fields'] = fields;
+    return this.call(successCallback, errorCallback);
+  }
+
   getUrl()
   {
     return this.domain + '/api/v1/call/' + this.target + '/' + this.focus;

package/src/Builder.js

@@ -3,28 +3,33 @@ export default class Builder {
     static availableMethod = [
         'select',
         'where',
+        'orWhere',
         'whereDate',
+        'orWhereDate',
         'whereYear',
+        'orWhereYear',
         'whereMonth',
+        'orWhereMonth',
         'has',
         'whereIn',
+        'orWhereIn',
         'whereNotIn',
+        'orWhereNotIn',
         'whereHas',
         'orWhereHas',
         'whereHasMorph',
         'orWhereHasMorph',
         'whereDoesntHave',
         'orWhereDoesntHave',
-        'orWhere',
-        'orderBy',
-        'groupBy',
         'whereNull',
         'orWhereNull',
         'whereNotNull',
         'orWhereNotNull',
-        /**
-         *@property Builder.availableMethod.with array
-         */
+
+
+        'orderBy',
+        'groupBy',
+
         'with',
         'withCount',
         'offset',
@@ -32,10 +37,6 @@ export default class Builder {
         'distinct',
         'owner',
         'whereAbs',
-
-        'whereDate',
-        'whereYear',
-        'whereMonth',
     ];
 
     constructor() {