diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/taler_merchant_service.h | 14 | ||||
-rw-r--r-- | src/include/taler_merchant_testing_lib.h | 10 | ||||
-rw-r--r-- | src/include/taler_merchantdb_plugin.h | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 98acae6f..2fa62302 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -792,7 +792,7 @@ struct TALER_MERCHANT_ProductGetHandle; * applicable taxes. * @param image base64-encoded product image * @param taxes list of taxes paid by the merchant - * @param total_stocked in @a units, -1 to indicate "infinite" (i.e. electronic books), + * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books), * does NOT indicate remaining stocks, to get remaining stocks, * subtract @a total_sold and @a total_lost. Note that this still * does not then say how many of the remaining inventory are locked. @@ -812,7 +812,7 @@ typedef void const struct TALER_Amount *price, const json_t *image, const json_t *taxes, - int64_t total_stocked, + int64_t total_stock, uint64_t total_sold, uint64_t total_lost, const json_t *location, @@ -883,7 +883,7 @@ typedef void * applicable taxes. * @param image base64-encoded product image * @param taxes list of taxes paid by the merchant - * @param total_stocked in @a units, -1 to indicate "infinite" (i.e. electronic books) + * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books) * @param address where the product is in stock * @param next_restock when the next restocking is expected to happen, 0 for unknown, * #GNUNET_TIME_UNIT_FOREVER_ABS for 'never'. @@ -902,7 +902,7 @@ TALER_MERCHANT_products_post ( const struct TALER_Amount *price, const json_t *image, const json_t *taxes, - int64_t total_stocked, + int64_t total_stock, const json_t *address, struct GNUNET_TIME_Absolute next_restock, TALER_MERCHANT_ProductsPostCallback cb, @@ -955,10 +955,10 @@ typedef void * applicable taxes. * @param image base64-encoded product image * @param taxes list of taxes paid by the merchant - * @param total_stocked in @a units, -1 to indicate "infinite" (i.e. electronic books), + * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books), * must be larger than previous values * @param total_lost in @a units, must be larger than previous values, and may - * not exceed total_stocked minus total_sold; if it does, the transaction + * not exceed total_stock minus total_sold; if it does, the transaction * will fail with a #MHD_HTTP_CONFLICT HTTP status code * @param address where the product is in stock * @param next_restock when the next restocking is expected to happen @@ -977,7 +977,7 @@ TALER_MERCHANT_product_patch ( const struct TALER_Amount *price, const json_t *image, const json_t *taxes, - int64_t total_stocked, + int64_t total_stock, uint64_t total_lost, const json_t *address, struct GNUNET_TIME_Absolute next_restock, diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index bba80d3b..1da7478f 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -266,7 +266,7 @@ TALER_TESTING_cmd_merchant_delete_instance (const char *label, * applicable taxes. * @param image base64-encoded product image * @param taxes list of taxes paid by the merchant - * @param total_stocked in @a units, -1 to indicate "infinite" (i.e. electronic books) + * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books) * @param address where the product is in stock * @param next_restock when the next restocking is expected to happen, 0 for unknown, * #GNUNET_TIME_UNIT_FOREVER_ABS for 'never'. @@ -284,7 +284,7 @@ TALER_TESTING_cmd_merchant_post_products2 ( const char *price, json_t *image, json_t *taxes, - int64_t total_stocked, + int64_t total_stock, json_t *address, struct GNUNET_TIME_Absolute next_restock, unsigned int http_status); @@ -327,9 +327,9 @@ TALER_TESTING_cmd_merchant_post_products (const char *label, * applicable taxes. * @param image base64-encoded product image * @param taxes list of taxes paid by the merchant - * @param total_stocked in @a units, -1 to indicate "infinite" (i.e. electronic books) + * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books) * @param total_lost in @a units, must be larger than previous values, and may - * not exceed total_stocked minus total_sold; if it does, the transaction + * not exceed total_stock minus total_sold; if it does, the transaction * will fail with a #MHD_HTTP_CONFLICT HTTP status code * @param address where the product is in stock * @param next_restock when the next restocking is expected to happen, 0 for unknown, @@ -348,7 +348,7 @@ TALER_TESTING_cmd_merchant_patch_product ( const char *price, json_t *image, json_t *taxes, - int64_t total_stocked, + int64_t total_stock, uint64_t total_lost, json_t *address, struct GNUNET_TIME_Absolute next_restock, diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 214baec9..df88210b 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -188,7 +188,7 @@ struct TALER_MERCHANTDB_ProductDetails * existing sales and lost product, in product-specific units. UINT64_MAX * indicates "infinite". */ - uint64_t total_stocked; + uint64_t total_stock; /** * Number of units of the product in sold, in product-specific units. |